saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
salt/doc/topics/releases/2018.3.3.rst
Benjamin Drung ae899aee64 Fix various spelling mistakes in release notes 
There are various spelling mistakes in the git commit messages in the
release notes.

Fix those spelling mistakes. Since each commit is either referenced by
the commit has or pull request, fixing those spelling mistakes has no
negative effect on finding those commit.

Signed-off-by: Benjamin Drung <benjamin.drung@ionos.com>
2022-03-16 16:45:52 -04:00

207 KiB
Raw Blame History

Salt 2018.3.3 Release Notes

Version 2018.3.3 is a security and bugfix release for 2018.3.0 <release-2018-3-0>.

Statistics

Warning

If you are using Jinja to dump lists or dictionaries in your SLS files, this will now cause errors in Python 2 since Jinja does not produce YAML-compatible output when strings in the data structures contain unicode types. The dictionary must be passed through a Jinja filter to produce YAML-compatible strings.

The below is an example of invalid SLS:

/etc/foo.conf:
  file.mangaged:
    - source: salt://foo.conf
    - template: jinja
    - defaults: {{ mydict }}

To make it valid, use either one of Salt's own json or yaml filters. Another option would be to use Jinja's tojson <release-2018-3-3-tojson-filter> filter.

/etc/foo.conf:
  file.mangaged:
    - source: salt://foo.conf
    - template: jinja
    - defaults: {{ mydict | tojson }}

Security Fix

CVE-2018-15751 Remote command execution and incorrect access control when using salt-api.

CVE-2018-15750 Directory traversal vulnerability when using salt-api. Allows an attacker to determine what files exist on a server when querying /run or /events.

Credit and thanks for discovery and responsible disclosure: nullbr4in, xcuter, koredge, loupos, blackcon, Naver Business Platform

Changes to win_timezone

Improves timezone detection by using the pytz module.

timezone.get_offset and timezone.get_zonecode now work properly.

Adds timezone.list to list supported timezones in either Windows or Unix format.

New Jinja Filter

The tojson filter (from Jinja 2.9 and later) has been ported to Salt, and will be used when this filter is not available. This allows older LTS releases such as CentOS 7 and Ubuntu 14.04 to use this filter.

You can use this filter any time you wish to dump a list or dictionary into an SLS file, to ensure that the result is able to be loaded by the YAML renderer. For example:

foo:
  bar.baz:
    - some_arg: {{ mydict | tojson }}

MacOSX escape characters with runas

You are now required to escape quotes when using the runas argument with the cmd module on macosx.

Example:

cmd.run 'echo '\''h=\"baz\"'\''' runas=macuser

Changelog for v2018.3.2..v2018.3.3

Generated at: 2018-09-21 17:45:27 UTC

  • PR #49662: (dwoz) Fix another bad filename reference in whitelist @ 2018-09-14 22:20:49 UTC
  • PR #49655: (dwoz) Fix windows test whitelist errors @ 2018-09-14 20:34:56 UTC
  • PR #49641: (rallytime) Back-port #49632 to 2018.3.3 @ 2018-09-13 16:46:02 UTC
    • PR #49632: (garethgreenaway) [2018.3] Fixing integration.states.test_file.FileTest.test_directory_max_depth (refs: #49641)
    • 3fb3ffdb37 Merge pull request #49641 from rallytime/bp-49632
    • d11a400825 Fixing failing test under python 3.7 causaed by changes to how os.makedirs sets initial permissions.
  • PR #49633: (garethgreenaway) [2018.3.3] Moving test_build_whitespace_split_regex to TestBuildWhitespaceRegex @ 2018-09-13 06:57:01 UTC
    • 0096cf10b5 Merge pull request #49633 from garethgreenaway/moving_test_into_correct_class
    • 370de07617 Lint: Add extra blank line
    • 27b93fcc68 Moving the test_build_whitespace_split_regex test into the TestBuildWhitespaceRegex class.
  • PR #49594: (rallytime) Back-port #49580 to 2018.3.3 @ 2018-09-10 19:59:41 UTC
  • PR #49589: (rallytime) Update old utils paths to use new utils paths @ 2018-09-10 16:51:31 UTC
  • PR #49550: (rallytime) Back-port #49548 to 2018.3.3 @ 2018-09-07 00:36:05 UTC
    • PR #49548: (garethgreenaway) [2018.3] Disabling State boto tests for Python 3.7+ (refs: #49550)
    • 202da7a94f Merge pull request #49550 from rallytime/bp-49548
    • 180692ccee Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests. This PR is disabling the tests in the test_boto_vpc state tests.
  • PR #49542: (twangboy) Update openssl @ 2018-09-06 16:11:34 UTC
  • PR #49536: (rallytime) Back-port #49524 to 2018.3.3 @ 2018-09-06 16:00:00 UTC
    • PR #49524: (garethgreenaway) [2018.3] Disable boto tests under 3.7 (refs: #49536)
    • d9f09da5d9 Merge pull request #49536 from rallytime/bp-49524
    • 9e7203e08a Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests.
  • PR #49535: (Ch3LL) Skip test_virt and pip_state requirements tests on macosx @ 2018-09-06 15:59:38 UTC
    • cb934bf0b6 Merge pull request #49535 from Ch3LL/skip_pip_mac
    • 50237e9daf Skip test_virt and pip_state requirements tests on macosx
  • PR #49499: (rallytime) Pin CherryPy version to < 18.0.0 in requirements files for PY2 @ 2018-09-04 18:52:44 UTC
    • 87d3dfe085 Merge pull request #49499 from rallytime/pin-cherrypy-2018.3.3
    • 9e274335a3 Pin CherryPy version to < 18.0.0 in requirements files for PY2
  • ISSUE saltstack/salt-jenkins#1075: (Ch3LL) [2018.3.3] arch python3 tests do not finish (refs: #49303, #49451)
  • PR #49467: (rallytime) Back-port #49451 to 2018.3.3 @ 2018-08-31 17:38:09 UTC
  • PR #49468: (rallytime) Back-port #49291 and #49331 to 2018.3.3 @ 2018-08-31 17:37:30 UTC
  • PR #49449: (rallytime) Mark status test as flaky @ 2018-08-30 18:10:44 UTC
  • PR #49444: (rallytime) Back-port #49299 to 2018.3.3 @ 2018-08-30 18:10:21 UTC
  • PR #49448: (rallytime) Back-port #49400 to 2018.3.3 @ 2018-08-30 18:04:29 UTC
  • PR #49446: (rallytime) Back-port #49356 to 2018.3.3 @ 2018-08-30 18:04:01 UTC
  • PR #49445: (rallytime) Back-port #49192 to 2018.3.3 @ 2018-08-30 18:03:44 UTC
  • PR #49443: (rallytime) Back-port #49197 to 2018.3.3 @ 2018-08-30 18:03:10 UTC
  • PR #49442: (rallytime) Back-port #49180 and related fixes to 2018.3.3 @ 2018-08-30 18:02:54 UTC
  • PR #49441: (rallytime) Back-port #49240 to 2018.3.3 @ 2018-08-30 18:02:40 UTC
  • PR #49440: (rallytime) Back-port #49258 to 2018.3.3 @ 2018-08-30 18:02:25 UTC
  • ISSUE #48880: (damntoken) Can't run cmd.run with UTF-8 chars as arguments / parameters. With custom module. (refs: #49322)
  • PR #49368: (rallytime) Back-port #49322 to 2018.3.3 @ 2018-08-28 17:15:15 UTC
  • PR #49363: (rallytime) Back-port #49245 to 2018.3.3 @ 2018-08-28 17:14:18 UTC
  • PR #49361: (rallytime) Back-port #49244 to 2018.3.3 @ 2018-08-28 17:12:58 UTC
  • PR #49362: (rallytime) Back-port #49240 to 2018.3.3 @ 2018-08-28 17:00:25 UTC
  • PR #49365: (rallytime) Back-port #49270 to 2018.3.3 @ 2018-08-28 16:56:23 UTC
  • PR #49364: (rallytime) Back-port #49243 to 2018.3.3 @ 2018-08-28 16:55:55 UTC
  • PR #49347: (Ch3LL) [2018.3.3] Backport #49345 @ 2018-08-28 01:54:00 UTC
  • PR #49323: (Ch3LL) Skip nonexistent branch test for git versions <1.7.10 @ 2018-08-25 19:52:48 UTC
  • ISSUE #32737: (Lothiraldan) No support for compound matcher in external auth configuration (refs: #49236)
  • PR #49313: (rallytime) Back-port #49236 to 2018.3.3 @ 2018-08-24 20:59:16 UTC
  • ISSUE saltstack/salt-jenkins#1075: (Ch3LL) [2018.3.3] arch python3 tests do not finish (refs: #49303, #49451)
  • PR #49311: (rallytime) Back-port #49303 to 2018.3.3 @ 2018-08-24 17:48:23 UTC
  • PR #49294: (Ch3LL) Move run_function call from __init__ to setup @ 2018-08-24 12:41:35 UTC
  • PR #49302: (twangboy) Fix installer 2018.3.3 @ 2018-08-24 12:41:14 UTC
  • PR #49241: (terminalmage) Don't silently catch SystemExit @ 2018-08-22 12:57:58 UTC
  • PR #49239: (Ch3LL) Use yaml's safe_dump in windows ec2 tests @ 2018-08-22 08:48:13 UTC
  • PR #49182: (terminalmage) Fix hanging syndic test @ 2018-08-18 12:10:32 UTC
  • PR #49172: (Ch3LL) [2018.3.3] cherry pick #49118 @ 2018-08-17 20:54:05 UTC
  • PR #49173: (Ch3LL) [2018.3.3] cherry pick #49167 @ 2018-08-17 20:30:27 UTC
  • PR #49171: (Ch3LL) [2018.3.3] cherry pick #49103 @ 2018-08-17 20:23:32 UTC
  • PR #49132: (Ch3LL) [2018.3.3] backport PR #49062 @ 2018-08-17 14:51:50 UTC
    • PR #49062: (weswhet) fix memoize on available macOS services (refs: #49132)
    • 58034c9dc3 Merge pull request #49132 from Ch3LL/bp-49062
    • 990fdb6a52 decorator link fix, updating context names, as well as updating macutils tests for latest changes
    • 3ab5d282be fixing an issue with memoize on macOS services, switching to useing __context__ instead
  • PR #49142: (Ch3LL) Remove -Z script_arg for cloud tests @ 2018-08-16 16:12:59 UTC
  • PR #49137: (Ch3LL) [2018.3.3] Update bootstrap script to latest release (2018.08.15) @ 2018-08-15 19:49:22 UTC
    • a03828884b Merge pull request #49137 from Ch3LL/bootstrap_2018.3.3
    • eb9a612096 [2018.3.3] Update bootstrap script to latest release (2018.08.15)
  • PR #49110: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-08-14 17:11:25 UTC
  • ISSUE #48665: (dgengtek) salt-api auth ldap generates a valid token when using bindpw and an invalid request (refs: #48901)
  • PR #48901: (garethgreenaway) [2018.3] fix to auth/ldap.py @ 2018-08-14 16:10:19 UTC
    • e78fc0e0eb Merge pull request #48901 from garethgreenaway/48665_auth_ldap_valid_token_failed_auth
    • d4e4f2e803 Fixing a typo in a comment.
    • 2eb167ea42 Fixing issue when a valid token is generated even when invalid user credentials are passed. This change verifies that the binddn credentials are valid, then verifies that the username & password (if not None) are also valid.
  • ISSUE #49081: (frogunder) Fluorine - I see error/traceback when running minion in debug mode (refs: #49085)
  • PR #49099: (rallytime) Back-port #49085 to 2018.3 @ 2018-08-14 12:42:51 UTC
  • ISSUE #49018: (Ch3LL) add MasterPillarUtil tests (refs: #49034)
  • PR #49071: (rallytime) Back-port #49034 to 2018.3 @ 2018-08-13 20:15:31 UTC
    • PR #49034: (garethgreenaway) [fluorine] Adding tests for MasterPillarUtil (refs: #49071)
    • bc033da677 Merge pull request #49071 from rallytime/bp-49034
    • 8108a4d31a Adding some tests for the grains, pillar and mine functions in the cache runner. These will also ensure that the relevant functions in salt.utils.master.MasterPillarUtil are functioning properly.
  • PR #49077: (rallytime) Back-port #49075 to 2018.3 @ 2018-08-13 20:00:00 UTC
  • PR #49096: (rallytime) Update the DOCBANNER image for saltconf @ 2018-08-13 19:59:39 UTC
  • PR #49055: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-08-13 19:20:11 UTC
  • PR #49084: (rallytime) [2018.3] Update bootstrap script to latest release @ 2018-08-13 18:14:42 UTC
    • db7ec46875 Merge pull request #49084 from rallytime/bootstrap-2018.3
    • 28dc8ce954 [2017.7] Update bootstrap script to latest release
  • PR #49052: (isbm) Python 3.7 support (backport 2018.3) @ 2018-08-13 13:06:51 UTC
  • ISSUE #48557: (whytewolf) file.line in python3 on windows 2012 r2 is adding extra CR line endings. (refs: #49026)
  • PR #49026: (dwoz) Fix file.line line endings @ 2018-08-13 13:05:43 UTC
  • PR #49038: (gtmanfred) disable enable_ssh_minions to see if it is slowing down 2018.3 tests @ 2018-08-10 18:07:59 UTC
    • 602fed7806 Merge pull request #49038 from gtmanfred/slowtest
    • 6bc44c91c4 remove localhost from tests
    • 7b168a5aac disable enable_ssh_minions to see if it is slowing down 2018.3 tests
  • ISSUE #48996: (jils2013) file.get_diff not work on version:2018.3.2 (refs: #49033)
  • PR #49033: (terminalmage) Fix file.get_diff for remote files @ 2018-08-09 21:06:53 UTC
  • ISSUE #48856: (travispaul) Salt fails to start on NetBSD 8 (refs: #48926)
  • PR #48926: (travispaul) Handle ifconfig output differently for NetBSD >= 8.0 @ 2018-08-09 20:07:44 UTC
    • b24c96a292 Merge pull request #48926 from travispaul/fix-netbsd-8-new-ifconfig
    • d59b6d8269 Add unit test for NetBSD 8 ifconfig changes
    • 80f8a667d1 Handle ifconfig output differently for NetBSD >= 8.0
  • PR #48803: (dmurphy18) Support for execution modules and states mount on AIX @ 2018-08-09 17:51:55 UTC
  • ISSUE #48496: (icy) Salt-key unable to delete the certificate Test=True (refs: #48929)
  • PR #48929: (terminalmage) 2 salt-key fixes @ 2018-08-09 17:50:07 UTC
  • ISSUE #47481: (whytewolf) Oxygen: task.add_trigger with start_date stating strptime needs a string not int. (refs: #49022)
  • PR #49022: (dwoz) Document time format idiosyncrasies @ 2018-08-09 17:47:12 UTC
  • PR #48932: (twangboy) Fix pkg.install when pkg already installed @ 2018-08-09 17:45:51 UTC
  • PR #49011: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-08-09 17:34:18 UTC
    • d7b7a92ef6 Merge pull request #49011 from rallytime/merge-2018.3
    • 02670969d0 Apply fix to ssh init file that was there before merge
    • 7e1f7915e4 Revert "Allow for not being prompted to supply a password to deploy keys to a minion with salt-ssh"
    • 00416d54d1 Revert "add key-deploy test"
    • c26fa0d6c4 Mark orchestration test as expensive
    • fceb6d8d6f Update old utils paths to use new paths
    • 3e6445a9d6 Merge branch '2017.7' into '2018.3'
      • b49eeca6e9 Merge pull request #49003 from rallytime/boto-test-2017.7
        • 1a23bb233f Update expected return value in boto test
      • 51eed1fdfb Merge pull request #48988 from rallytime/merge-2017.7
      • 10fd4661ff Merge pull request #48978 from gtmanfred/2017.7
      • 5b2423e527 Merge pull request #48959 from rallytime/flaky-tests
        • aaf986d728 Mark one grains test as flaky & convert to pytest notation
        • e7e5abcf48 Mark 2 matcher tests as flaky
      • 79994ecab4 Merge pull request #48962 from garethgreenaway/1022_test_service_disable_debian_part_deux
        • 9e71551b36 Update the elif block to only be true for versions below Debian 9.
      • 1a1bda00cb Merge pull request #48960 from dwoz/block_replace_tests
      • 93b862f350 Merge pull request #48957 from whytewolf/beacons_log_doc_change
        • a77fd16869 Update salt.beacons.log to reflect that re module is used for matching.
      • 0245cffb07 Merge pull request #48955 from terminalmage/service-systemd
        • 23f87bd536 Don't load service.py if minion is running a non-sysvinit init system
      • 848d583438 Merge pull request #48950 from KaiSforza/kitchenfix-2017.7
        • 5242cb143a Added a quote to kitchen Jenkinsfiles
      • 928d688d65 Merge pull request #48943 from rallytime/flaky-tests
        • 668da57ab9 Mark some shell and runner integration tests as flaky
      • cd42510d3a Merge pull request #48940 from rallytime/bp-48852
        • fa4ef92e79 Record all the artifacts from the build
      • 43649a68be Merge pull request #48935 from garethgreenaway/1045_test_pkg_015_installed_held_centos
        • 0bb10107b6 Merge branch '2017.7' into 1045_test_pkg_015_installed_held_centos
        • 24d5e6a22f Fixing the test_pkg_015_installed_held test to be able to successfully run on CentOS
      • 2421e2a570 Merge pull request #47100 from gtmanfred/ssh
        • 5b443af7ae add key-deploy test
        • a131c9beeb Allow for not being prompted to supply a password to deploy keys to a minion with salt-ssh
      • d541bd6446 Merge pull request #48891 from damon-atkins/2017.7_win_pkg.list_pkgs_not_found
        • a4af1dbfb1 Fix win_pkg issues introduced Jan 2018. If DisplayVersion does not exist it should return version as "Not Found"
      • 5f6a56f5dc Merge pull request #48896 from rallytime/bp-48730
      • 0c64bba865 Merge pull request #48933 from garethgreenaway/1022_debian_8_failing_service-test
        • 280d1d2ad2 Fixing failing test, integration.modules.test_service.ServiceModuleTest.test_service_disable_doesnot_exist, on Debian 8 and higher.
      • 0c3d2c6a09 Merge pull request #48922 from rallytime/cache-doc-error
      • 8d1fc4f8e5 Merge pull request #48866 from Ch3LL/cmd_win_tests
        • 905da13653 Merge branch '2017.7' into cmd_win_tests
      • 57d58e7541 Merge pull request #48920 from rallytime/bp-48904-2017.7
        • a55f92954a No rehashing in parallel
        • 3be11e06fe Add docs for new escape kwarg
        • 391bb8a411 use a specific path for just the cmd._run call
        • 62c66ba489 make sure we lower the check on shell
        • 9312a993a5 Add cmd module integration tests for windows and fix space in path issue
  • ISSUE #48123: (c-wicklein) file.directory with recurse fails when it encounters a broken symbolic link (refs: #48985)
  • PR #48985: (garethgreenaway) [2018.3] Fix to salt/modules/file.py @ 2018-08-09 15:03:09 UTC
    • 3325b7d4c0 Merge pull request #48985 from garethgreenaway/48123_file_directory_recurse_fails_broken_symlink
    • 10c4eca206 Merge branch '2018.3' into 48123_file_directory_recurse_fails_broken_symlink
    • a404cc030f Fixing the issue when using the file.directory state with recurse if the directory contains a broken symbolic link. This fix adds an additional conditional, is_link, before running lsattr since lsattr does not work on symlinks and causes issues when that symlink is broken.
  • ISSUE #47695: (AmbicaY) Continuous error in the proxy minion logs (refs: #49019)
  • PR #49019: (garethgreenaway) [2018.3] Fix to scheduler when global enabled key is present @ 2018-08-09 13:06:26 UTC
    • d353c02a8c Merge pull request #49019 from garethgreenaway/47695_fixing_scheduler_bug_when_enabled_is_present
    • aff1b8f6d4 Lint.
    • 8935c08141 Fixing a bug that occurs if the "enabled" key is present in the scheduler items dictionary. Adding a test to ensure scheduler runs as expected when that key is present.
  • PR #49023: (The-Loeki) Salt SSH appends IdentityFile=agent-forwarding @ 2018-08-09 12:55:59 UTC
  • PR #48981: (Ch3LL) Add warning to mac runas docs about escaping characters @ 2018-08-08 19:43:43 UTC
    • 4590494b50 Merge pull request #48981 from Ch3LL/mac_runas_quote
    • 8269b55b84 remove unnecessary spaces in cmdmod.py docs
    • 757daf7d7e add runas macosx warning in 2018.3.3 release notes
    • 4e9e985b14 Add warning to mac runas docs about escaping characters
  • PR #49004: (rallytime) Port #48999 to 2018.3 @ 2018-08-08 15:32:46 UTC
  • PR #48987: (twangboy) Fix issue with win_iis.create_cert_binding @ 2018-08-08 13:29:06 UTC
  • ISSUE #48777: (jonasgit) file.recurse fails on file contents encoding not utf-8 (refs: #48934)
  • PR #48934: (terminalmage) Properly handle latin-1 encoding in file diffs @ 2018-08-07 21:02:24 UTC
    • ab1a713bc3 Merge pull request #48934 from terminalmage/issue48777
    • 52c64e4d51 Fix to_unicode test
    • e2d19f40b6 Only try latin-1 from get_diff instead of by default
    • d39fa889f3 Add stringutils.get_diff to mocks
    • 5b191c9120 Fix incorrect use of __salt__ when __utils__ is needed
    • 53ba10ad5f Skip pylint false-positives
    • f14f4dae22 Add unit test for latin-1 fallback, multi-encoding
    • 906644a80f PY3 scoping fix
    • 726dd4331f Add integration test for latin-1 file diffs
    • 2dd1f31d23 Use BASE_FILES instead of redundant STATE_DIR
    • 612ffb5fe8 Use new get_diff helper in file module
    • c632265802 Make to_unicode/to_str/to_bytes helpers attempt latin-1
    • 2a0cb49b01 Add get_diff to salt.utils.stringutils
  • ISSUE #47766: (zerthimon) salt-cloud: openstack driver: crash on instance creation (refs: #48956)
  • PR #48956: (gtmanfred) if booted from volume, use string from image @ 2018-08-07 16:39:45 UTC
  • ISSUE #48306: (davidscholberg) Documentation update for custom returners used for master job cache (refs: #48319)
  • PR #48319: (gtmanfred) don't break older returners right now @ 2018-08-06 13:19:43 UTC
  • PR #48941: (rallytime) Back-port #48912 to 2018.3 @ 2018-08-06 13:09:38 UTC
  • PR #48897: (rallytime) Back-port #48863 to 2018.3 @ 2018-08-05 19:15:51 UTC
  • PR #48928: (Ch3LL) fix test_runas integration test for macosx @ 2018-08-05 14:24:13 UTC
  • PR #48899: (Ch3LL) remove base_top_file file in teardown and add sleep @ 2018-08-05 14:23:42 UTC
  • PR #48898: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-08-05 14:23:19 UTC
  • PR #48893: (Ch3LL) handle when ca_certs is None in utils.http @ 2018-08-03 20:30:48 UTC
  • PR #48903: (Vaelatern) Wrap ElementTree.tostring to make strs, not bytes @ 2018-08-03 19:12:34 UTC
  • PR #48900: (Ch3LL) skip getpwnam check on mac in unit test_cmdmod @ 2018-08-03 16:38:51 UTC
  • PR #48921: (rallytime) Back-port #48904 to 2018.3 @ 2018-08-03 15:17:15 UTC
  • PR #48877: (Vaelatern) Wrap ElementTree.tostring to make strs, not bytes (refs: #48903) @ 2018-08-02 19:28:56 UTC
    • 1e150923aa Merge pull request #48877 from Vaelatern/improve-salt-cloud-libvirt-python3-libvirt
    • fb7885315c Wrap ElementTree.tostring to make strs, not bytes
  • PR #48824: (rallytime) Bump deprecation in win_servermanager state to Neon @ 2018-08-02 18:01:34 UTC
    • 1fb7d9431b Merge pull request #48824 from rallytime/win_servermanager_deprecations
    • 6ef5412528 Bump deprecation in win_servermanager state to Neon
  • ISSUE #37512: (ChristianBeer) What's the precedence if multiple master configurations are specified? (refs: #48888)
  • PR #48888: (terminalmage) Explicitly document the configuration override priority @ 2018-08-02 16:57:18 UTC
    • ec8e07e8ce Merge pull request #48888 from terminalmage/issue37512
    • 7dce7cde14 Explicitly document the configuration override priority
  • PR #48871: (dwoz) Remove unicode key pairs from environ after test @ 2018-08-01 22:33:41 UTC
  • PR #48843: (isbm) Prevent u'something' to appear in help info. @ 2018-08-01 20:38:58 UTC
    • bec79e83a3 Merge pull request #48843 from isbm/isbm-log-level-names-fix-2
    • a63686180d Merge branch '2018.3' into isbm-log-level-names-fix-2
    • 783c96ac72 Prevent u'something' to appear in help info.
  • PR #48855: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-08-01 17:44:59 UTC
    • a8376b537a Merge pull request #48855 from rallytime/merge-2018.3
    • 44998c208e Lint: Fix undefined logger variable
    • 92c9317a25 Update old utils paths to use new paths
    • 15bfba7143 Merge branch '2017.7' into '2018.3'
      • 05f2d65de3 Merge pull request #48853 from rallytime/bp-48850
        • 3c33ee554a Skip tests in integration.shell.test_master
      • 8a1285239a Merge pull request #48426 from garethgreenaway/46689_fixing_pkg_held_when_package_is_installed
        • 9b0f5dd212 Fixing indentation, removing some unnecessary conditionals.
        • 727964ab55 One last cleanup.
        • 11cb86e6eb General cleanup in pkg state, reducing duplicate code. Fixing the requires_salt_modules decorator, sys.doc was returning too much information for the event to handle. This change specifically calls sys.doc with the module name.
        • 16fb6ae635 Make sure pkg.hold and pkg.unhold are available before running the test.
        • 998651102d Fixing a situation when a package is already installed via salt or manually and a state attempts to set that package to be held. Previously the holding/unholding logic was only being run against packages that were being installed. This change moves the holding logic outside and runs it against all desired packages. Adding a new test to test holding logic.
      • c8e69431ff Merge pull request #47734 from OrlandoArcapix/Issue47689-pip-state-performance
        • 662bd1f780 Merge branch '2017.7' into Issue47689-pip-state-performance
        • 66936b4f41 Changed string comparison in pip test to match new confirmation string - ref PR #47734.
        • bb5939d6ef Merge branch '2017.7' into Issue47689-pip-state-performance
        • d6a49ae41c Merge branch '2017.7' into Issue47689-pip-state-performance
        • d4083fc9d1 Merge branch 'Issue47689-pip-state-performance' of github.com:OrlandoArcapix/salt into Issue47689-pip-state-performance
          • 779b5fa785 Merge branch '2017.7' into Issue47689-pip-state-performance
        • f3653349ab Removed whitespaces at end of added comments lines
        • db11f2ff4b Merge branch '2017.7' into Issue47689-pip-state-performance
        • eac0178de2 Ref: #47689 - document additional kwarg passed to pip._check_if_installed function
        • 0d19803106 Merge branch '2017.7' into Issue47689-pip-state-performance
        • d3678bf2f3 #47689 fix lint errors
        • 4fec8f6bcc #47698 improve run-speed of pip package state checks by only loading the current package list once when checking multiple packages
      • 83a5b3cc47 Merge pull request #48844 from AVeenstra/fix-python3-incompatibility
        • f238779a62 Merge branch '2017.7' into fix-python3-incompatibility
        • 6b1805afc6 Fixed Python 3 incompatibility in methods in nilrt_ip and debian_ip.
      • 136ff6735a Merge pull request #48662 from slaws/fix-retention-schedule-48637
      • 1fc04f281b Merge pull request #48840 from gtmanfred/docs
      • 0a19f845ea Merge pull request #48834 from gtmanfred/slsutil
        • f9441d2bef read output of stringio if it is readable
      • 2e00939a6e Merge pull request #48788 from Ch3LL/timezone_windows
  • ISSUE #48659: (dstoliker) file.grep with glob (*) in path produces file not found error (refs: #48830)
  • PR #48830: (garethgreenaway) [2018.3] Fixes to file.grep @ 2018-07-31 21:30:04 UTC
    • e23ba01cd2 Merge pull request #48830 from garethgreenaway/48659_file_grep_glob_fix
    • 0791b0a03c FileGrepTestCase tests back to 2018.3
    • 2e01c55e7e Fixing a bug that prevents specifying wildcards for filenames.
  • PR #48814: (isbm) dmidecode race conditions check @ 2018-07-31 20:48:29 UTC
  • PR #48804: (Ch3LL) Use brew path from which cmd in mac_brew module @ 2018-07-31 20:24:33 UTC
  • PR #48836: (dwoz) Fix unicode directory listing on py2 @ 2018-07-31 20:22:53 UTC
  • PR #48847: (terminalmage) Update file.blockreplace docs to reflect changed functionality @ 2018-07-31 18:11:30 UTC
    • baf8c5784a Merge pull request #48847 from terminalmage/issue48695
    • e2bdf7fb92 Update file.blockreplace docs to reflect changed functionality
  • PR #48587: (twangboy) Fix lgpo issue on Py3 @ 2018-07-31 18:05:58 UTC
  • PR #48796: (Ch3LL) Remove fake su used in integration tests @ 2018-07-31 17:08:54 UTC
  • ISSUE #38310: (ghost) Unable to checkout external pillar git repo using its git tag (refs: #48689)
  • PR #48689: (linoplt) Fix ext_pillar remote checkout using tag (pygit2) @ 2018-07-31 16:15:58 UTC
    • 00d06bda76 Merge pull request #48689 from linoplt/fix_38310_pygit2_checkout_ext_pillar_remote_using_tag
    • eb4361dcc2 Merge branch '2018.3' into fix_38310_pygit2_checkout_ext_pillar_remote_using_tag
    • c20977e3bc Merge branch '2018.3' into fix_38310_pygit2_checkout_ext_pillar_remote_using_tag
    • b0157c215b Fix ext_pillar remote checkout using tag (pygit2)
  • PR #48838: (sizgiyaev) Fixed: added additional return code 200 for succeeded vault api request @ 2018-07-31 16:14:22 UTC
    • 5e14e36195 Merge pull request #48838 from sizgiyaev/fix-vault-policy-state
    • 02d09c6281 Fixed: added additional return code 200 for succeeded api request
  • PR #48714: (dwoz) Always transfer bytes from fileserver roots @ 2018-07-30 22:37:13 UTC
    • 69f81214d1 Merge pull request #48714 from dwoz/state_echo_fix
    • ce3ed43dab Always use unix line endings
    • d5e60090bc Merge pull request #2 from terminalmage/state_echo_fix
      • 52fc1c955d Simplify file contents in roots fileserver test
      • b6f73e8e57 Remove trailing whitespace on what should be a blank line
    • 95329acb1e Fileserver transfers bytes
    • aa34a80997 Always transfer bytes from fileserver roots
  • PR #48822: (Ch3LL) Fix salt-ssh state.sls_id TypeError key must be a string @ 2018-07-30 20:29:29 UTC
  • ISSUE #47999: (arthurlogilab) Carbon returner failing when run through scheduler on log.trace (refs: #48757)
  • PR #48791: (rallytime) Back-port #48757 to 2018.3 @ 2018-07-27 21:30:44 UTC
  • PR #48799: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-07-27 21:30:13 UTC
  • ISSUE #48020: (calvinhp) mine.get not returning data in a state.orchestrate sls (refs: #48765)
  • PR #48765: (FedericoCeratto) [2018.3] Fix mine.get not returning data @ 2018-07-27 18:01:06 UTC
  • PR #48747: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-07-26 18:14:34 UTC
  • ISSUE #48676: (djneades) salt-ssh should not target wrong minion from roster file as a result of reverse-DNS lookups (refs: #48771)
  • PR #48771: (gtmanfred) only do reverse dns lookup on ips for salt-ssh @ 2018-07-26 15:41:40 UTC
  • PR #48752: (garethgreenaway) [2018.3] Fix when state file is integers @ 2018-07-25 15:03:02 UTC
    • f2ef2d3ef6 Merge pull request #48752 from garethgreenaway/fix_state_file_all_integers
    • 790801c67e Fixing a case where the state module would fail if the state file being passed was all integers. Added a new tests for this edge case.
  • ISSUE #46896: (Poil) Proxy + file.managed => Comment: Failed to cache xxx invalid arguments to setopt (refs: #48754)
  • PR #48754: (lomeroe) send proxy/ca_cert parameters as strings (not unicode) to tornado httpclient @ 2018-07-25 14:55:42 UTC
    • 030c921914 Merge pull request #48754 from lomeroe/fix-tornado-proxy
    • d33056704b pass proxy_user, proxy_password, proxy_host, and ca_certs through salt.utils.stringutils.to_str()
  • PR #48769: (Ch3LL) Update Saltstack Logo banner on docs.saltproject.io @ 2018-07-25 14:47:19 UTC
    • 1eee4b136b Merge pull request #48769 from Ch3LL/update_doc_2018.3
    • 0cb4bac798 Update Saltstack Logo banner on docs.saltproject.io
  • PR #48760: (dwoz) Multiple windows test fixes @ 2018-07-25 11:55:27 UTC
  • PR #48753: (dwoz) Finally fix prepend for real @ 2018-07-25 00:07:15 UTC
  • PR #48756: (dwoz) os.uname is not available on py2 windows @ 2018-07-24 23:38:32 UTC
  • ISSUE #48536: (whytewolf) diskusage beacon does not recognize tmpfs disks in linux. (refs: #48718)
  • PR #48718: (garethgreenaway) [2018.3] beacon diskusage fixes @ 2018-07-24 17:45:26 UTC
    • 062fe7cccf Merge pull request #48718 from garethgreenaway/48536_beacon_diskusage_fixes
    • 38a65e8fb3 Fixing test_diskusage_nomatch and test_diskusage_match_regex
    • 6ecca166ff Updating psutil.disk_partitions to pull in all mounts not just the physical ones. Check to see if the mount point from the configuration ends with a $ (regular expression end of line) if not we add one in to ensure that a simple / does not end up matching all mount points. Updating tests accordingly.
  • PR #48711: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-07-24 17:38:58 UTC
    • e873621009 Merge pull request #48711 from rallytime/merge-2018.3
    • ea5c063237 Update old utils paths to use new paths
    • e740d3b208 Merge branch '2017.7' into '2018.3'

      • 689c231d2b Merge pull request #48691 from Ch3LL/win_repo_pkg_test

        • 4b7d6d80c5 Remove unnecessary jinja in curl.sls file
        • 2bedadfadb Add windows pkg module integration tests

      • 83e4bba916 Merge pull request #48635 from nbraud/acme

        • 3673bae9de modules/acme: explicitly ignore the perms return value
        • 1800a231e8 Fixup some schema expectations
        • 8c718cb417 acme: Make the private key mode configurable
        • 917dea6761 modules/acme: Use file.check_perms ret-morphing powers
        • d2241ceb2d module/acme: Do not exit early when the certificate already exists
        • 98af0db826 modules/acme: Set the private key filemode to 0640

      • 85991680c8 Merge pull request #48345 from twangboy/fix_48169

      • 96447ce541 Merge pull request #48656 from Ch3LL/windows_ip_mod

        • 90c3f568b1 Add windows ip module integration tests

      • 0c5fff3dc8 Merge pull request #48638 from twangboy/fix_vcredist

      • 1ebd96d909 Merge pull request #48664 from Ch3LL/srv_disable_mac

        • f1fbfad387 move the disable call up in try block
        • f60d21bda4 reverse assertion order for service disable test
        • 3727d1b3b9 switch try/except to match 2018.3
        • fb953c2369 [2017.7] Fix service.disabled test for macosx

      • 3da3cf2f3f Merge pull request #48625 from Ch3LL/ssh_state

      • 33812f78f1 Merge pull request #48673 from Ch3LL/mac_port

        • 87dd85a220 Use different pub and ret ports for testprogram integration tests

      • 5f6a7c4d89 Merge pull request #48675 from Ch3LL/mac_disable

      • 93d2f51d2b Merge pull request #48658 from wyardley/wyardley-npm-json-output-2017

      • 3e293b0513 Merge pull request #48678 from OrlandoArcapix/fix-npm-dryrun-test

        • 851a404f6b Fix for issue #48677 - return True when no changes are to be made with npm.bootstrap with test=true

      • 07a1f6520f Merge pull request #48580 from rallytime/fix-46884

        • 736b382e91 Don't error on retcode 0 in libcrypto.OPENSSL_init_crypto call

      • 9874429741 Merge pull request #48628 from terminalmage/testinfra

      • 0d4c80205f Merge pull request #48651 from gtmanfred/pylint-2017.7

      • 160ae29cf2 Merge pull request #48647 from gtmanfred/pylint-2017.7

      • 47b1032efa Merge pull request #48593 from pritambaral/fix/2017.7-importlib-pyc-loading-order

        • add7894dee loader: Fix suffix order when importlib is used

      • 9da7b2ec8d Merge pull request #48630 from dubb-b/pipeline-updates

        • 8594a8dd05 Adding PY_COLORS=1 as PY_COLORS = 1 instead
        • 314b0e3599 Adding PY_COLORS=1 for python programs to use ANSI Colors
        • b705e8f7a5 Adding correct spacing to options section
        • 9d8a7e07db Adding options to Jenkins pipline builds

      • a8ae2adf64 Merge pull request #48633 from saltstack/revert-48610-2017.7

        • bab4a769d4 Revert "only run pylint on files that change"

      • 6e32bb7f74 Merge pull request #48614 from rallytime/bp-48562

      • 1b6e6388f8 Merge pull request #48588 from garethgreenaway/48415_event_send_multi_master

        • fab25af1a9 Adding some quick documentation about why we are setting ret=True following the channel.send.
        • bf78f4b188 If the channel send is successful and does not raise an exception, we set ret to True, in case a previous exception from a previous channel send to another master has sent it to False.
        • 8d1551c5fb When using Salt multi-master, if we encouter a salt master that has not accepted the minion key yet we should not exit right away, rather continue on and try the next salt master available in the list.

      • 24ffda49ba Merge pull request #48610 from gtmanfred/2017.7

      • 5391dd0a8d Merge pull request #48584 from Ch3LL/mac_user_grp

        • 585ee9db90 Fix grp import for mac in test_user integration test

      • 61572b6780 Merge pull request #48555 from Ch3LL/ssh_id

      • aa6dcf39e8 Merge pull request #48583 from Ch3LL/mac_flaky_tests

        • 4ba2299a87 import flaky decorator on mac tests
        • 811220b41e Add flaky decorator to mac_system and mac_timezone tests

      • 6973152057 Merge pull request #48534 from xetix/fix-zypper-latest_version

        • 9985f0b4c1 Lint: remove extra blank line
        • 5fbead8a36 Merge branch '2017.7' into fix-zypper-latest_version
        • 56ac449271 Merge branch 'fix-zypper-latest_version' of https://github.com/xetix/salt into fix-zypper-latest_version
          • 44e87f5a0f Adding testcase for this fix.
          • b354c6863c Fix behaviour of function latest_version in zypper module when multiple packages are passed to function. Function now properly return dict with empty string as version if latest packages is already installed, and multiple packages are passed to function
        • db35d0c1e1 Adding testcase for this fix.
        • d2513757ed Fix behaviour of function latest_version in zypper module when multiple packages are passed to function. Function now properly return dict with empty string as version if latest packages is already installed, and multiple packages are passed to function

      • 10124034cb Merge pull request #48582 from dwoz/test_prepend_fix

        • f37571e0bd Merge branch '2017.7' into test_prepend_fix

      • 13f67335f3 Merge pull request #48564 from dwoz/test_prepend_fix

      • b8ce27729f Merge pull request #48558 from dwoz/test_file_fix

        • c858bf477f Remove which mock to get the test passing

      • a15c65202d Merge pull request #48552 from KaiSforza/jenkins-junit-2017

      • f73108026e Merge pull request #48550 from gtmanfred/2017.7

      • 113b0426f8 Merge pull request #48535 from asnell/asnell-patch-2

  • PR #48744: (rallytime) [2018.3] Update DOCBANNER with new SaltConf18 image @ 2018-07-24 17:15:40 UTC
  • PR #48726: (dwoz) Skip test when syslog not available @ 2018-07-24 16:12:44 UTC
  • PR #48727: (dwoz) Windows compatible cp test @ 2018-07-24 14:41:34 UTC
  • ISSUE #40004: (te-af-github) svn changes report (refs: #47510)
  • ISSUE #21025: (RobertFach) svn.export reports invalid change data (2014.7.x) (refs: #47510)
  • PR #48710: (rallytime) Back-port #47510 to 2018.3 @ 2018-07-23 21:11:18 UTC
  • PR #48699: (terminalmage) Add missing release notes mention of file.blockreplace changes @ 2018-07-23 13:34:32 UTC
    • e1dd10be70 Merge pull request #48699 from terminalmage/issue48695
    • 7ad832c901 Add missing release notes mention of file.blockreplace changes
  • PR #48700: (dwoz) Call sync_modules to fix Windows test case @ 2018-07-22 22:23:48 UTC
  • PR #48653: (terminalmage) docker_container.running: Fix regression in test mode @ 2018-07-20 19:15:47 UTC
    • 6a494205f2 Merge pull request #48653 from terminalmage/docker-unboundlocal
    • b0440871a0 Merge branch '2018.3' into docker-unboundlocal
    • 9515dd17ff docker_container.running: Fix regression in test mode
  • ISSUE #47059: (OrlandoArcapix) Some states incorrectly return None instead of an empty dict when there are no changes (refs: #48685)
  • ISSUE #46985: (OrlandoArcapix) grafana4_user.present and grafana4_org.present states not working in 2018.3.0 (refs: #48685)
  • PR #48685: (bbinet) Use empty dict for 'changes' instead of None @ 2018-07-20 17:12:43 UTC
  • PR #48670: (bbinet) Add the "traverse" jinja filter @ 2018-07-20 16:36:21 UTC
  • PR #48594: (pritambaral) Backport 48418 @ 2018-07-20 14:57:19 UTC
  • ISSUE #48184: (mmulqueen) Invalid DMI prevents salt-minion from running (refs: #48440)
  • PR #48440: (mmulqueen) Make core.py tolerant of invalid chars in DMI data @ 2018-07-20 14:48:07 UTC
    • PR #48216: (Ch3LL) Fix UnicodeDecodeError when reading file to determine virtual grain (refs: #48440)
    • 111908f519 Merge pull request #48440 from mmulqueen/patch-1
    • 5bbbdc74cd Make core.py tolerant of invalid chars in DMI data
  • PR #48663: (Ch3LL) [2018.3] Fix service.disabled test for macosx @ 2018-07-20 14:32:22 UTC
  • PR #48304: (Ch3LL) Fix macosx grains when swapusage returns comma @ 2018-07-20 14:30:59 UTC
  • PR #48671: (bbinet) Few fixes to the grafana module and states (refs: #48685) @ 2018-07-20 13:58:02 UTC
    • 9d7eabd24e Merge pull request #48671 from bbinet/grafana-fixes
    • 3c5083f550 Add support for dry run (test=True) of grafana states
    • 7e7ae8ace7 influxdb: fix conflicts in function arg names with client_args
    • 73a24b774a Ignore readOnly option when diffing
    • 81f0cf8a3f Add missing profile argument to grafana4.get_user_data
  • PR #48650: (gtmanfred) [2018.3] handle pyzmq for python3.4 @ 2018-07-18 17:34:37 UTC
  • PR #48648: (gtmanfred) [2018.3] disable checks on pylint @ 2018-07-18 16:21:37 UTC
  • PR #48634: (dwoz) Sync modules for state tests @ 2018-07-17 20:33:06 UTC
  • PR #48585: (astorath) replaced meta tag @ 2018-07-16 14:11:02 UTC
  • PR #48579: (Ch3LL) Fix python2 syslog returner expecting string bytes not unicode @ 2018-07-13 19:50:16 UTC
    • 4b16537a29 Merge pull request #48579 from Ch3LL/fix_syslog
    • d8288a0ffc add unicode type for syslog test for tag
    • 17e69382d5 Fix python2 syslog returner expecting string bytes not unicode
  • ISSUE #48542: (calvinhp) Missing state git.cloned is listed in the docs as new for 2018.3.2 (refs: #48547)
  • PR #48547: (gtmanfred) fix git.cloned doc versionadded @ 2018-07-13 18:46:25 UTC
  • ISSUE #48110: (whytewolf) file.line on windows not treating unix line endings correctly. (refs: #48503)
  • PR #48503: (rallytime) Back-port #46291 to 2018.3 @ 2018-07-13 17:14:47 UTC
    • PR #48380: (twangboy) Detect and preserve line endings (refs: #48503)
    • PR #46291: (t0fik) Line mixed line ends (refs: #48503)
    • PR #45498: (t0fik) Added support for mixed line ending in file (refs: #46291)
    • ee257a1f91 Merge pull request #48503 from rallytime/bp-46291
    • 8bc71688ea Remove /sr.* pattern from test
    • 5e2e2a63fa Update file unit tests to handle "writelines" change
    • 5d38aa8b33 Update file.line to use writelines instead of joining
    • d0b6e82ecb Add 'name' as the passed in filepath for test_line_insert_ensure_before_first_line test
    • d8920cb61f Update test_line_insert_ensure_before_first_line to use new mock_open methodologies
    • 475f075d8e Handle list of lines instead of strings in file.line func
    • b9ddd53b04 Added comments
    • f3517a1852 List comprehension replaced
    • adfa3aed0d Empty match on delete or replace not causing IndexError exception
    • 5169b1f7fd Comprehensions converting to unicode replaced by salt.utils.data.decode_list
    • d3e8679e05 Removed regex compilation
    • f29815b49b Fixed file permissions
    • d2af81e9c7 Make integration green. Added test for mode ensure insert before first line
    • 9b7df671a5 file.line function refactored
    • 3af551ebe1 /sr.* pattern should raise exception
    • 935a9b9d56 test_line_insert_end fixed
    • 7d6e3ad2e2 Make tests green
    • 75a7e368a6 Setting end of line
    • 489e381100 Added set_line_eol and get_eol functions
    • aacbb8c0e2 line function refactored to work on list
    • de668166f9 regex_to_static refactored to work on lists
    • 464eef6fe1 get_line_indent renamed to set_line_indent
  • ISSUE #48507: (emersonveenstra) mysql_grants.present escape option incorrectly reports failure (refs: #48561)
  • PR #48561: (garethgreenaway) [2018.3] fixes to grants in mysql module @ 2018-07-13 14:24:58 UTC
    • 2d923f2943 Merge pull request #48561 from garethgreenaway/48507_mysql_grants_incorrect_failure
    • 14c59da72c Following a successful grant application in the MySQL module, the new grant and the desired grant are mismatched because the new grant from Mysql included hashmarks. This change adds the replace which is included for other items such as database name and username.
  • PR #48529: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-07-12 17:59:35 UTC
    • 5b5a930449 Merge pull request #48529 from rallytime/merge-2018.3
    • f9b8c4b257 Use () when using with_tempfile decorator in tests
    • d3190ca0c0 Update old utils paths to new utils paths
    • 29b05ffdd1 Merge branch '2017.7' into '2018.3'
      • 0c0c05c2bc Merge pull request #48527 from saltstack/revert-48525-2017.7
        • 18d06c1a93 Revert "add kazoo for testing zookeeper."
      • 05bad3e71c Merge pull request #48526 from twangboy/rollback_certifi-win32
      • db066effe4 Merge pull request #48521 from Martin819/2017.7
      • ed0bd2bbec Merge pull request #48525 from gtmanfred/2017.7
      • ad5a959ab9 Merge pull request #48388 from garethgreenaway/48277_2017_7_file_roots_wrong
        • 6f11da35a7 Fixing a few things in the new test.
        • cf747b14ec Fixing lint issue
        • 16d36c79c8 When pillar items are compiled a new render is instantiated but the file_roots is the pillar_roots. This change forces the __opts__['file_roots'] to be set to what is set in actual_file_roots for all renderers once compile_pillar has finished. Adding a test when this situation is run via a orchestration runner.
      • 38df812257 Merge pull request #48512 from gtmanfred/npm
        • 9ba0f6b3a0 pin pm and grunt packages for npm tests
      • 04ba31147f Merge pull request #48513 from rallytime/merge-2017.7
        • a466a4880f Merge branch '2017.7.7' into '2017.7'
          • cfd21ed22c Merge pull request #48172 from rallytime/2017.7.7-release-notes
          • 8af4452134 Merge pull request #48157 from gtmanfred/2017.7.7
            • d8209e8a40 always listen when gathering job info
          • b98c52ee51 Merge pull request #48140 from rallytime/man-pages-2017.7.7
          • baa0363336 Merge pull request #48136 from gtmanfred/2017.7.7
            • fce1c31146 bootstrap kitchen branch tests with 2017.7.6
          • b0ba08f4d9 Merge pull request #48134 from rallytime/release-notes-2017.7.7
          • 084de927fe Merge pull request #48098 from rallytime/bp-48075-2017.7.7
            • e4e62e8b3a Ensure that the shared list of jids is passed when creating the Minion. Fixes an issue when minions are pointed at multiple syndics.
      • f0352ea95a Merge pull request #48514 from gtmanfred/2017.7
        • 739bf92599 upgrade dependencies for pytest tests
      • 5372b60137 Merge pull request #48491 from grokrecursion/group-fix-v2
      • 16d3daab3c Merge pull request #48375 from Ch3LL/file_copy
        • d16a790775 Add mode to makedirs call in file.copy
        • 2cbcb4fd26 Add user and group to makedirs cmd in file.copy
      • d38951b1b3 Merge pull request #48490 from KaiSforza/cifixes
  • PR #48553: (KaiSforza) Set up junit in jenkins @ 2018-07-12 16:24:01 UTC
  • PR #48551: (gtmanfred) add posargs to tox pylint @ 2018-07-12 14:35:25 UTC
  • PR #48533: (terminalmage) Fix UnicodeDecodeError in sh beacon @ 2018-07-12 13:38:43 UTC
  • ISSUE #48519: (Lutseslav) Mysql module alter_db quotation missing (refs: #48520)
  • PR #48520: (Lutseslav) Add quotes to schema name in ALTER DATABASE. @ 2018-07-11 19:15:08 UTC
    • 8761ac2589 Merge pull request #48520 from Lutseslav/fix-alter-databases-with-special-symbols
    • d088b00ff2 Merge branch '2018.3' into fix-alter-databases-with-special-symbols
    • 59629e9757 Merge branch '2018.3' into fix-alter-databases-with-special-symbols
    • da8336712e Add quotes to schema name in ALTER DATABASE.
  • PR #48528: (gtmanfred) add 2018.3 requirements for tox/pytest tests @ 2018-07-11 18:13:40 UTC
  • ISSUE #48336: (JuanManuelVizcainoAbad) file.directory (refs: #48399, #48398)
  • PR #48508: (rallytime) [2018.3] Fix 2 bugs found in the file.check_perms function @ 2018-07-11 15:03:32 UTC
  • ISSUE #48277: (dvenckus) init.sls with included states fails with more than one, 'Template was specified incorrectly: False' (refs: #48388, #48389)
  • ISSUE #46986: (github-abcde) opts file_roots gets overwritten with pillar_roots in orchestration run (refs: #48388, #48389)
  • PR #48389: (garethgreenaway) [2018.3] reset file_roots for renderers after compile_pillar @ 2018-07-11 13:13:33 UTC
    • 5a0b274bf1 Merge pull request #48389 from garethgreenaway/48277_2018_3_file_roots_wrong
    • 4b492fa633 Removing unused start_time variable from test_orchestration_with_pillar_dot_items test.
    • 30c5855d20 Fixing a few things in the new test.
    • 36b7253418 Fixing lint issue
    • ab6abfad31 When pillar items are compiled a new render is instantiated but the file_roots is the pillar_roots. This change forces the __opts__['file_roots'] to be set to what is set in actual_file_roots for all renderers once compile_pillar has finished. Adding a test when this situation is run via a orchestration runner.
  • ISSUE #48342: (jeffclay) UnicodeDecodeError when using cache mysql (refs: #48495)
  • PR #48495: (garethgreenaway) [2018.3] Fix to mysql cache module @ 2018-07-10 12:54:10 UTC
    • f9fd1a889a Merge pull request #48495 from garethgreenaway/48342_mysql_cache_unicode
    • 0029f19033 Ensure the query_string is a bytestring, otherwise an attempt will be made to convert the msgpack data to unicode which will result in a UnicodeDecodeError error.
  • PR #48487: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-07-09 18:38:00 UTC
    • fc3eeef6b3 Merge pull request #48487 from rallytime/merge-2018.3
    • 54341d1a8d Update old utils paths to use new utils paths
    • 68aabff0cf Merge branch '2017.7' into '2018.3'
    • 22cd4206c4 Merge pull request #48472 from gtmanfred/2017.7
    • 27ea8f35ea Merge pull request #48476 from twangboy/fix_dependencies
    • acf42864aa Merge pull request #48399 from garethgreenaway/48336_2017_7_ensure_chmod_setuid_with_chown
      • 8efd33320f Normalize the mode before we compare it.
      • f894f0ecb8 Setting the mode with setuid or setgid bits in addition to setting the owner and group will force the setuid & setgid bits to reset. This change ensures that we set the mode after setting the owner & group.
    • 6166ff6b78 Merge pull request #48471 from gtmanfred/2017.7
    • 6234d9b15d Merge pull request #48433 from discogestalt/fix-redis.hmset
    • aacee0fe2c Merge pull request #48428 from terminalmage/fix-jobs.lookup_jid
      • 6509aa9089 Fix outputter detection in jobs.lookup_jid runner
    • a7e52f0de2 Merge pull request #48429 from rallytime/bp-46824
      • 8b4486248d Added ignore_retcode to mock unit tests
      • f8beab71dd Regression to ignore retcodes on crontab calls
    • 4576ef20bc Merge pull request #48432 from dwoz/file-prepend-again
  • PR #48481: (terminalmage) Improve the slack engine docs @ 2018-07-09 13:41:15 UTC
  • PR #48348: (dwoz) Fix multiple git module tests @ 2018-07-06 20:35:58 UTC
  • PR #48454: (terminalmage) Improve error message when ext_pillar is incorrectly formatted @ 2018-07-06 18:03:44 UTC
    • dd6a6a97c5 Merge pull request #48454 from terminalmage/issue48107
    • 269dbab7f6 Improve error message when ext_pillar is incorrectly formatted
  • ISSUE #48336: (JuanManuelVizcainoAbad) file.directory (refs: #48399, #48398)
  • PR #48398: (garethgreenaway) [2018.3] fixes to module/file.py (refs: #48508) @ 2018-07-06 18:02:43 UTC
    • a9dc758e73 Merge pull request #48398 from garethgreenaway/48336_ensure_chmodd_setuid_with_chown
    • 2454652914 Normalize the mode before we compare it.
    • 08ad5665de Fixing test to ensure it works under py3
    • 2b25d8c95b Setting the mode with setuid or setgid bits in addition to setting the owner and group will force the setuid & setgid bits to reset. This change ensures that we set the mode after setting the owner & group.
  • PR #48431: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-07-05 17:23:00 UTC
  • PR #48310: (mtorromeo) Backport ini_manage fixes to 2018.3 @ 2018-07-05 16:27:19 UTC
    • 432cbbb5ee Merge pull request #48310 from mtorromeo/ini-manage-backports
    • 88f80fdf77 Fixed pylint useless-super-delegation warning.
    • e20f4cacd4 Uniformed reports between ini.options_absent and ini.options_present
    • 2c3ae0b6c9 pylint cosmetics.
    • 0c0d10d18f Fixes dry run false positive when option value is a number.
    • 70144bccbb Fixes dry run in ini_manage + Fixes related bug - when working with options which are not in section. + Fixes related tests + Fixes pylint warnings
  • ISSUE #48402: (elsmorian) Running SaltStack master with no init system repeatedly logs "could not determine init system " (refs: #48441)
  • PR #48441: (terminalmage) Switch init system log message to debug @ 2018-07-05 14:43:25 UTC
  • PR #48386: (Ch3LL) Update release versions for the 2018.3 branch @ 2018-07-03 13:37:32 UTC
    • 871c9e3b98 Merge pull request #48386 from Ch3LL/1update_version_doc_2018.3
    • 84a1994110 Update release versions for the 2018.3 branch
  • PR #48404: (Ch3LL) [2018.3] Remove In Progress Warning on 2017.7.7 @ 2018-07-03 13:33:18 UTC
  • PR #48339: (terminalmage) Backport tojson filter from #48309 to 2018.3 @ 2018-07-02 17:52:53 UTC
    • PR #48309: (terminalmage) Drop support for Python 2 unicode string literals in YAML renderer (refs: #48339)
    • 5b38019ca0 Merge pull request #48339 from terminalmage/backport-tojson-filter
    • 4433bec891 Add release notes for tojson jinja filter
    • ac36998801 Tweak docs to reflect backported filter
    • c636b18cf0 Add unit test for tojson filter
    • e34e39f0e2 Document filter deprecation
    • b9a4f288b2 Deprecate json_encode_dict and json_encode_list jinja filters
    • 3896e3468c Use upstream tojson filter, if present
    • 1499c6abcf Implement tojson jinja filter for those using Jinja < 2.9
  • ISSUE #48274: (ipmb) s3.get signature failure with + in the object name (refs: #48328)
  • PR #48328: (garethgreenaway) [2018.3] Fixes to utils/s3.py @ 2018-07-02 13:22:31 UTC
    • 222c1d65db Merge pull request #48328 from garethgreenaway/48274_s3_get_signature_fail
    • 22cafc8334 fixing lint issue
    • 131486203e Need to pass the URL path through quote to ensure any special characters are being quoted properly. if we include local_file for a PUT, read the file into data before passing it along to requests.requests.
  • PR #48358: (Ch3LL) Fix corrupt public key with m2crypto python3 @ 2018-07-02 13:10:32 UTC
  • ISSUE #48367: (asenci) salt.proxy.fx2: dictionary changed size during iteration (refs: #48368)
  • ISSUE #46765: (roskens) pkg.mod_repo fails with a python error when removing a dictionary key (refs: #46776)
  • PR #48384: (rallytime) Back-port #48368 to 2018.3 @ 2018-07-01 04:19:10 UTC
  • PR #48394: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-07-01 04:13:03 UTC
  • ISSUE #45939: (andygabby) user.present with hash_password: True detects change on every state.apply/highstate (refs: #47147)
  • PR #47147: (eliasp) states.user.present: Make usage of hash_password idempotent @ 2018-06-30 13:29:27 UTC
    • 9b364e25cf Merge pull request #47147 from eliasp/2018.3-issue-45939-shadow-hash-salt
    • dd3be1d76e Add warning log message when using MD5 for hashing shadow passwords
    • 5451ab6b7a states.user.present: Make usage of hash_password idempotent
  • PR #48297: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-06-30 12:57:35 UTC
  • PR #48364: (dubb-b) Changing debug to info for logging @ 2018-06-28 20:48:24 UTC
  • PR #48354: (rallytime) [2018.3] Merge forward from 2018.3.2 to 2018.3 @ 2018-06-28 20:26:31 UTC
  • PR #48347: (dwoz) Fixes fileserver maintenance process on Windows @ 2018-06-28 13:17:42 UTC
  • PR #47975: (terminalmage) Add a new git.cloned state @ 2018-06-27 20:53:42 UTC
  • PR #48323: (Ch3LL) Update release versions for the 2018.3 branch @ 2018-06-27 13:44:58 UTC
    • 5b8d55428e Merge pull request #48323 from Ch3LL/update_version_doc_2018.3
    • b4548aca56 Update release versions for the 2018.3 branch
  • PR #48326: (Ch3LL) Remove In Progress Warning for 2018.3.2 Release @ 2018-06-27 13:43:16 UTC
  • PR #48301: (terminalmage) Fix typos in new mock_open docs @ 2018-06-25 19:08:14 UTC
  • PR #48292: (rallytime) Back-port #48288 to 2018.3 @ 2018-06-25 19:07:11 UTC
  • PR #48296: (rallytime) Back-port #48258 to 2018.3 @ 2018-06-25 19:04:41 UTC
  • ISSUE #48204: (zerthimon) State mysql_user.present Exception with mysql 8.0.11 (refs: #48275, #48228)
  • PR #48275: (garethgreenaway) [2018.3] Follow up fix to MySQL user for password management @ 2018-06-25 13:23:35 UTC
    • d5265da945 Merge pull request #48275 from garethgreenaway/mysql_fix_followup
    • bb024b9115 Removing unnecessary code.
    • 8b542e1745 With MySQL versions 8.0.11 and beyond, since the PASSWORD function has been removed we need to hash the password string before comparing when checking if the user exists.
  • PR #48286: (terminalmage) Don't load the grains again when printing them via salt-call -g @ 2018-06-25 13:19:18 UTC
    • 1f306525a7 Merge pull request #48286 from terminalmage/caller-print_grains
    • caa62c051f Don't load the grains again when printing them via salt-call -g
  • PR #48279: (terminalmage) Add documentation/further enhancements to rewritten mock_open @ 2018-06-25 13:12:30 UTC
    • 27a0e95174 Merge pull request #48279 from terminalmage/mock_open-docs
    • 65c575ae9c Fix spelling error
    • 830a624ce8 Ignore IOError when tearing down filehandles not opened for reading
    • 3b6356f4b0 Raise TypeError when trying to read from filehandles not opened for reading
    • 09aae0c82b Add more examples and information on strict string types
    • 8c069d105d Add some mock_open docs
    • a13d1fe1a0 Update mock_open usage to reflect read_data type enforcement
    • 374a8ce31f Add more mock_open tests
    • 0f06adb008 Improve code-reuse in mock_open tests
    • 0e8c83bac6 2 MockFH enhancements:
  • ISSUE #48141: (zerthimon) salt-api request causes exception (refs: #48236)
  • PR #48236: (garethgreenaway) [2018.3] Fix to cmd_batch @ 2018-06-25 12:58:49 UTC
    • 6ee856631b Merge pull request #48236 from garethgreenaway/48141_salt_api_local_batch
    • aea4f7ae14 Fixing test_local_batch
    • ce3e1eaf2c Removing sort.
    • 83accf3b20 Fixing test_local_batch
    • ff14b99752 Fixing a typo in the comment.
    • 85cef126e0 Adding note about why salt.utils.versions is being re-imported. Adding a test for local_batch.
    • 808805fd3d Fixing cmd_batch to work correctly when called via salt-api.
  • ISSUE #48204: (zerthimon) State mysql_user.present Exception with mysql 8.0.11 (refs: #48275, #48228)
  • PR #48228: (garethgreenaway) [2018.3] Fixes to mysql module @ 2018-06-22 15:44:00 UTC
    • 09b036c26e Merge pull request #48228 from garethgreenaway/48204_mysql_user_password_exception
    • 1b2ffcef1d Updating the mysql module to not use the PASSWORD when MySQL is version 8.0.11 or higher, where the PASSWORD function has been removed.
  • PR #48252: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-06-22 15:13:42 UTC
    • 67cb5563ef Merge pull request #48252 from rallytime/merge-2018.3
    • 84ec655c24 Merge branch '2017.7' into '2018.3'
      • a172f9de84 Merge pull request #48226 from terminalmage/fix-alias-docstring
        • fb237272f5 Don't display "None" in SaltInvocationError when Salt installed using -OO
        • 90c90f5d5c Fix docstring construction in alias_function when Salt installed using -OO
      • c6a0207cae Merge pull request #48227 from Ch3LL/fix_win_tests
        • 236773e3e9 Skip new sha256 files on repo.saltstack.com/windows
      • 6929423528 Merge pull request #48131 from bowmanjd-lms/fix-apk-python3
        • f5d2835299 Merge branch '2017.7' into fix-apk-python3
        • 022f9cba50 Fix py3-incompatible dict.keys()[x] call in apk.py
      • 868c17377f Merge pull request #48185 from DSRCorporation/bugs/47901_future_done_exception
        • 5f63316311 Merge branch '2017.7' into bugs/47901_future_done_exception
        • 9f2dbf94cb Don't call .exception() on future unless it's done.
      • 80a3e37c2e Merge pull request #48192 from twangboy/fix_pip_version_2017.7
        • 59ae2cc5fc Use --disable-pip-version-check for build_env#.ps1
      • 12e2b8882a Merge pull request #48201 from zer0def/lxc-bootstrap-fixes
        • 6f6d3d40d4 Take lxcpath into account when bootstrapping new containers. Version comparison fixes.
      • e079fce38d Merge pull request #48190 from terminalmage/fix-vfstab-test
      • c8b9cec986 Merge pull request #48115 from KaiSforza/pr-lint-2017
      • fc1752b721 Merge pull request #48174 from terminalmage/docker-update-mine
        • 9af09e0127 Mock config.get due to changes in refresh_mine_cache
        • c5802ad465 Fix the version number in versionadded
        • d403ae58d7 Add unit test for docker.update_mine
        • 44c275698a Actually it's more than just add/remove that updates the mine
        • 0cb6996b07 Add release notes mention of docker.update_mine config option
        • de05097b20 Add docs for new config option
        • 04c55a9178 Add note in mine.get_docker docstring about new config item
        • 4e456255c0 Allow mine update to be disabled using new config option
  • ISSUE #48029: (vinian) syndic failed to auth when restart salt-master on syndic master (refs: #48034)
  • PR #48034: (vinian) restart salt-syndic when salt-master restart @ 2018-06-21 20:12:37 UTC
    • 9f0bd90c5b Merge pull request #48034 from vinian/restart-salt-syndic-when-salt-master-retart
    • f7652d8c8b restart salt-syndic when salt-master restart
  • PR #48250: (rallytime) Update release notes for 2018.3.2 @ 2018-06-21 18:30:21 UTC
  • PR #48166: (terminalmage) Add trace logging and optimize file handling in grains.core.os_data @ 2018-06-21 18:02:33 UTC
    • 51928ff050 Merge pull request #48166 from terminalmage/salt-jenkins-1000
    • b73df0ab00 Change call_args to call.args to reflect changes to MockFH
    • 0c2cc07704 remove unused import
    • b8c0a55cf3 Add test for tell()
    • 1cbe89feee Implement tell() for filehandle iteration
    • efb8f49d42 Add tests for read_data being a list, and containing unicode or bytestrings
    • 38df912fa6 Operate on a copy of the read_data
    • 71eeae1240 Update mount module unit tests to reflect changes in mock_open
    • 16c414e120 Update nfs3 module tests to reflect changes in mock_open
    • b7eab25d6c Update grub_legacy module tests to reflect changes in mock_open
    • cc002b8fd7 Update new network unit test to reflect changes in mock_open
    • a8f11594f1 Update new core grains tests to reflect changes in mock_open
    • 84ce18d956 Update crypt unit tests to reflect changes in mock_open
    • 67c036dc2d Add MockCall to tests.support.mock to track calls
    • 2556a1e13d Remove unused import
    • fd9d700157 Add additional docs to MockOpen class
    • 6acb4c83ec Update newly added test to reflect renaming of handles attribute
    • 77e5288d42 Update fibre_channel grains tests to reflect changes in mock_open
    • ed40371a06 Update timezone module tests to reflect changes in mock_open
    • fc0aa9934f Track call_count in MockOpen
    • 2598d2453a Update snapper module tests to reflect changes in mock_open
    • 51b3faa7b4 Add support for passing multiple strings for a given match in read_data
    • 55487c175c Fix mock_open call to use new multifile syntax
    • 7f516ef73a Update puppet module tests to reflect changes in mock_open
    • 33a97c4ecc Update btmp beacon tests to reflect changes in mock_open
    • bc027cfa94 Update wtmp beacon tests to reflect changes in mock_open
    • f5823252bb Track call args/kwargs in MockFH
    • 335591ca90 Mock the seek function in MockFH
    • 7eb4b1ae1c Update cp.push test to reflect changes to mock_open
    • 2be19cfa89 Report correct location when reading using explicit size and EOF reached
    • 5ec95ba5ca On second thought, actually implement tell()
    • 19022eb9e5 Add tell mock to MockFH
    • 4b5a393445 Update junos tests to reflect changes to mock_open
    • 278a222b09 Update dnsutil tests to reflect changes to mock_open
    • 4e67955572 Replace the rest of mock_open with a class
    • 75307a47c5 Update linux_sysctl tests to reflect changes to mock_open
    • 05c68fd5d9 Use explicit config file and fix remaining mac_sysctl tests
    • 836fde9a30 Allow Python 2 to accept an exception as read_data
    • 543385fd02 Add writelines_calls property
    • 42fa842456 Make read funcs mocks so their calls can be tracked
    • 675f03c58f Update mac_sysctl tests to reflect new mock_open behavior
    • 3d2c41d395 Update file module tests to reflect new mock_open behavior
    • b9200dbc3e add a dict containing the handles to the mock_open return object
    • 852ba4b982 Add mocked close() function to MockFH
    • f6b46bc608 Remove unused import
    • 20f60a769b Add blank lines to appease linter
    • 48d7cfa6d3 Add multifile tests for mock_open
    • 1861e9b944 mock_open: rewrite multi-file support
    • 5e6b539770 Use function for empty string
    • cb2620ad2b Update core grains tests to reflect EAFP changes
    • 5d09b178d7 Separate mocked file contents per filename, not glob
    • 875102f538 Modify mock_open to support multiple file paths
    • 096ace74df Move lsb_release parsing into its own function
    • 6a0828beed Add unit tests for mock_open
    • 8ba6cadac7 More mock_open bugfixes
    • 329dea218e Add a bunch of logging for linux os_data core grains
    • 2c64b270df Add timestamp to the minion's log_fmt_console
  • PR #48216: (Ch3LL) Fix UnicodeDecodeError when reading file to determine virtual grain (refs: #48440) @ 2018-06-20 16:53:41 UTC
    • 6072d1ef9c Merge pull request #48216 from Ch3LL/grains_unicode
    • c4334f3f14 Fix UnicodeDecodeError when reading file to determine virtual grain
  • PR #48212: (Ch3LL) Fix python3 ec2 salt-cloud TypeError when installing salt (refs: #49041) @ 2018-06-20 16:00:21 UTC
  • ISSUE #47984: (jeduardo) x509 module/state writing wrong certificate serial number to CRL (refs: #47986, #48080)
  • PR #48209: (rallytime) Back-port #47986 to 2018.3 @ 2018-06-20 13:44:17 UTC
    • PR #48080: (lusche) Bugfix #47984 messed up cert serial (refs: #48209)
    • PR #47986: (jeduardo) Fix serial number writing into CRL files with the x509 module (refs: #48209)
    • de614d31f5 Merge pull request #48209 from rallytime/bp-47986
    • f4b3bd5d2c Changed salt.utils.fopen to salt.utils.files.fopen
    • 8686872909 Fixed typos, removed repeated unit tests, and applied code fixes suggested by linter.
    • 382df48a72 Removed useless new line
    • 5aa99d14c4 Added unit tests for CRL creation and certificate revocation with CRL
    • cc12844922 Fixed a problem where the OpenSSL bindings refuse to consume unicode strings.
    • 399cf08860 Stopped converting the certificate hexadecimal serial number to an integer in order to avoid breaking CRLs.
  • PR #48210: (rallytime) [2018.3] Merge forward from 2018.3.1 to 2018.3 @ 2018-06-20 13:43:19 UTC
  • PR #48186: (rallytime) Add autodoc module for saltcheck.py @ 2018-06-19 19:03:55 UTC
  • PR #48191: (twangboy) Use the --disable-pip-version-check option @ 2018-06-19 18:13:44 UTC
  • ISSUE #48122: (pasmon) Salt minion 2017.7.6 disregards "bin_env" in pip state (refs: #48189)
  • PR #48189: (gtmanfred) If pip binary is passed to bin_env, use that pip binary (refs: #48207) @ 2018-06-19 18:08:13 UTC
  • PR #48165: (terminalmage) Fix regression with top_file_merging_strategy=same @ 2018-06-19 18:03:07 UTC
  • ISSUE #46806: (ezh) Lack of debug messages on authentication fail. (refs: #46807, #48179)
  • PR #48179: (ezh) 2018.3 auth @ 2018-06-19 14:16:40 UTC
    • PR #46807: (ezh) Reduce initial authentication setup complexity (refs: #48179)
    • 2a8e1c6539 Merge pull request #48179 from ezh/2018.3-auth
    • 9ed2d2ec55 Fix integration.shell.test_key and integration.shell.test_runner
    • 26a6f79730 Fix integration tests test_list_acc_wrong_eauth, test_salt_run_with_wrong_eauth
    • b84c4321c4 Add more verbose debug messages for auth subsystem
  • PR #48188: (gtmanfred) allow virtual aliases to be used for the driver name @ 2018-06-18 21:49:16 UTC
  • PR #48116: (KaiSforza) Add jenkinsfiles to define tests in 2018 @ 2018-06-18 21:27:10 UTC
  • ISSUE #48146: (rmarchei) mysql_query.run: exception on 2018.3 (refs: #48164)
  • PR #48164: (garethgreenaway) [2018.3] Fixes to mysql state @ 2018-06-18 13:10:20 UTC
    • 60c9490bdc Merge pull request #48164 from garethgreenaway/48146_mysql_output_to_file
    • a040643a82 Accounting for certain situations when the query result is not a string, but actually a dictionary.
  • ISSUE #48113: (gaetanquentin) state file.line has error and erase file content completely, while with mode test=true it is ok (refs: #48156)
  • PR #48156: (garethgreenaway) [2018.3] Unicode fixes for file.line @ 2018-06-17 19:34:08 UTC
    • 85ebcbd3f2 Merge pull request #48156 from garethgreenaway/48113_ensure_writing_strings_with_file_dot_line
    • 5a9ef0d1ae Unless we're using py2 and Windows, ensure we're writing out a string when using file.line.
  • PR #48161: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-06-17 19:33:29 UTC
    • 33400e72db Merge pull request #48161 from rallytime/merge-2018.3
    • 0733fa1b02 Update utils path for which function to new path
    • 398cc78224 Merge branch '2017.7' into '2018.3'
    • df2a156338 Merge pull request #48061 from garethgreenaway/port_47049_2017_7
    • 5ec3cf2dd4 Merge pull request #48143 from Ch3LL/fix_long_job
      • 48b5d2e9d3 Add timeout argument to run_salt for ShellCase
    • e1e566d1f8 Merge pull request #48135 from rallytime/release-notes-2017.7
      • 7a97f157b3 Add missing v for tag reference
      • 2f2b69ed37 Add "in progress" notation to 2017.7.7 release notes
      • 06a1151a63 Add release notes file for 2017.7.7
      • 885b2862ce Move 2017.7.7 release notes to 2017.7.8
    • ac9dabbfaa Merge pull request #48105 from rallytime/merge-2017.7
    • 2da56a69d9 Merge pull request #48101 from rallytime/update-doc-refs-2017.7
      • 7ba6f5fb36 Update 2017.7.7 reference to 2017.7.8
    • 5a0e3d46e7 Merge pull request #48091 from terminalmage/fix-file_roots-monkeypatching
      • 6fe711ad76 Reverse monkeypatching after test_symlink_list finishes
    • 053b019a8f Merge pull request #48088 from rallytime/update_version_doc_2017.7
      • 1b8d1c936b Remove "in progress" info for 2017.7.6 release notes
      • 9a0f4d190a Update release versions for the 2017.7 branch
    • d6d2c5ee18 Merge pull request #48075 from garethgreenaway/48038_jobs_are_not_deduping_minion_side
      • c537b3275b Ensure that the shared list of jids is passed when creating the Minion. Fixes an issue when minions are pointed at multiple syndics.
    • aa33cc0b0c Merge pull request #48071 from terminalmage/gitfs-docs
      • 24545204b3 Fix inaccurate gitfs_saltenv example in GitFS Walkthrough
    • fb4ceacb88 Merge pull request #48053 from rallytime/bp-48040
      • 265b22b194 states/github.py fix for incorrect positional argument
    • f37dcaac6d Merge pull request #48024 from gtmanfred/2017.7
      • 56b074ab27 allow specifying a different state to run on converge
      • cc9c4b4d5a add pytest coverage and xml junits
  • ISSUE #48145: (max-arnold) Failed to load ext_pillar saltclass: can only assign an iterable (refs: #48155)
  • PR #48155: (max-arnold) Do not fail on empty saltclass classes (fix for #48145) @ 2018-06-15 20:21:28 UTC
  • PR #48104: (twangboy) Fix unit.modules.test_win_status @ 2018-06-15 17:05:34 UTC
    • 152c09cc0c Merge pull request #48104 from twangboy/fix_test_win_status
    • 1ec3f436ee Fix test_error_logged_if_process_get_owner_fails
  • PR #48147: (brejoc) Fix for sorting of multi-version packages @ 2018-06-15 17:03:18 UTC
    • 8cf03110d4 Merge pull request #48147 from brejoc/2018.3-multi-version-fix
    • 90ed25447d Swtiching to salt.utils.versions like linter suggested
    • ed09574073 Fix for sorting of multi-version packages (bsc#1097174 and bsc#1097413)
  • PR #47956: (dmurphy18) Improved support for mount on AIX @ 2018-06-15 13:40:01 UTC
  • ISSUE #48012: (Timandes) Found UnicodeDecodeError when trying to start Salt Master (refs: #48081)
  • PR #48081: (terminalmage) Fix UnicodeDecodeError when parsing hosts file with non-ascii @ 2018-06-15 12:41:13 UTC
  • PR #48133: (rallytime) Updates the 2018.3.2 and 2018.3.3 release notes files @ 2018-06-14 21:21:15 UTC
  • PR #48103: (terminalmage) Fix for gitfs base env being pinned to commit ID @ 2018-06-14 16:29:24 UTC
    • 0e3f846836 Merge pull request #48103 from terminalmage/gitfs-base-pinned-to-commit
    • 31ab2fe8de Fix for gitfs base env being pinned to commit ID
  • PR #48077: (twangboy) Fix issue with salt.utils.parsers on Windows @ 2018-06-14 16:22:57 UTC
  • PR #48096: (twangboy) Fix unit.utils.test_which on Windows @ 2018-06-14 13:15:14 UTC
  • PR #48102: (rallytime) [2018.3] Update 2018.3.2 references to 2018.3.3 @ 2018-06-14 13:14:26 UTC
  • PR #48109: (rallytime) Back-port #47851 to 2018.3 @ 2018-06-14 13:09:04 UTC
  • ISSUE #47925: (JonGriggs) GitFS looking for files in the master branch only (refs: #47943)
  • PR #47943: (terminalmage) Make sure we set the effective environment when lock_saltenv is True @ 2018-06-13 20:02:00 UTC
  • PR #48089: (rallytime) Update release versions for the 2018.3 branch @ 2018-06-13 14:03:44 UTC
    • 9e1d0040e4 Merge pull request #48089 from rallytime/update_version_doc_2018.3
    • fad6a0991e Remove "in progress" info for 2018.3.1 release notes
    • a3b3b0a0e1 Remove "in progress" info for 2017.7.6 release notes
    • f9be1b9125 Update release versions for the 2018.3 branch
  • PR #48054: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-06-13 12:58:46 UTC
  • PR #48060: (gtmanfred) mark test as expensive @ 2018-06-13 12:58:21 UTC
  • PR #48057: (terminalmage) Fix link without target in 2018.3.0 release notes @ 2018-06-11 18:50:17 UTC
  • PR #48042: (terminalmage) Switch to trace level logging for further test failure troubleshooting @ 2018-06-11 14:03:48 UTC
    • 0f9a3122df Merge pull request #48042 from terminalmage/salt-jenkins-1000
    • b33a0b5eaa Switch to trace level logging for further test failure troubleshooting
  • PR #48041: (terminalmage) salt.utils.hashutils: Only decode to utf-8 on Windows @ 2018-06-11 13:31:41 UTC
    • 6c5389189a Merge pull request #48041 from terminalmage/hashutils-fix-windows
    • 58c7cd33d7 salt.utils.hashutils: Only decode to utf-8 on Windows
  • PR #48014: (cro) Find job pause @ 2018-06-08 13:48:45 UTC
    • dcae209951 Merge pull request #48014 from cro/find_job_pause
    • 440aa67c4f Lint: Add blank line
    • 7b0e99a511 One more case where returner doesn't respond
    • 5abeedf882 Catch two cases when a returner is not able to be contacted--these would throw a stacktrace.
  • PR #47915: (garethgreenaway) [2018.3] state runner pause resume kill @ 2018-06-07 16:08:30 UTC
    • ea85f882bc Merge pull request #47915 from garethgreenaway/state_runner_pause_resume_kill
    • 2ecbe9c034 fixing typo in alias_function call.
    • 4377e0cc08 Some fixes to the set_pause and rm_pause function in the state runner, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality.
  • PR #48002: (rallytime) Back-port #47923 to 2018.3 @ 2018-06-07 15:25:39 UTC
  • PR #48003: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-06-07 15:25:19 UTC
    • 3d0a087c71 Merge pull request #48003 from rallytime/merge-2018.3
    • a6533a9332 Merge branch '2017.7' into '2018.3'
      • 998a1c13d5 Merge pull request #47966 from mbunkus/fix-postfix-prefix-free-key-names-assumption
        • 0ae402d1b5 Fix postfix.set_main's assumption of prefix-free key names
      • df50ce7b1b Merge pull request #47824 from twangboy/fix_setup.py
      • 3e91a31134 Merge pull request #47922 from damon-atkins/2017.7_win_pkg_keys_fix
        • 7129203b1b Merge branch '2017.7' into 2017.7_win_pkg_keys_fix
      • 8008fca2f6 Merge pull request #47933 from terminalmage/add-pillar.get-docs
      • ab565bfaa3 Merge pull request #47944 from terminalmage/fix-git.detached-docs
        • 1d082b4389 Replace use of deprecated argument name in git.detached docstring
        • 6253793cb6 Merge branch '2017.7' into 2017.7_win_pkg_keys_fix
        • 4ce0fe6546 win_pkg under py3 keys returns a view instead of a list, wrap keys in list()
  • PR #48022: (morganwillcock) win_wua state: fix function name in examples @ 2018-06-07 15:03:52 UTC
  • ISSUE #47546: (ender8282) archive.extracted fails when archive includes files with non-ascii names with 2018.3.0 (refs: #48015, #47572)
  • PR #48015: (garethgreenaway) [2018.3] more unicode nonsense in archive module @ 2018-06-07 14:44:55 UTC
    • 406efb161e Merge pull request #48015 from garethgreenaway/47546_more_unicode_nonsense
    • f457f9cb84 Adding a test to ensure archive.list returns the right results when a tar file contains a file with unicode in its name.
    • 9af49bc595 Ensure member names are decoded before adding to various lists.
  • ISSUE #47955: (frogunder) 2018.3.1 Creating Windows machine in Amazon using salt-cloud fails. (refs: #47989)
  • PR #47989: (dwoz) Properly decode password from aws using m2crypto @ 2018-06-06 20:44:28 UTC
  • PR #47976: (terminalmage) Capture and log output of processes that timed out and were killed @ 2018-06-06 19:17:08 UTC
    • 76068c83f5 Merge pull request #47976 from terminalmage/salt-jenkins-1000
    • 41e5a75027 Add catch_timeout to run_script
    • 551ada8e4d Capture and log output of processes that timed out and were killed
  • PR #47990: (terminalmage) Docs fixes in 2018.3 release branch @ 2018-06-06 17:15:17 UTC
  • PR #47982: (twangboy) Fix unit.modules.test_win_dns_client tests @ 2018-06-06 15:02:10 UTC
  • PR #47985: (twangboy) Fix unit.states.test_reg test failure @ 2018-06-06 14:56:03 UTC
  • ISSUE #47236: (MorphBonehunter) x509.private_key_managed broken after upgrade to 2018.3.0 (refs: #47957)
  • PR #47957: (garethgreenaway) [2018.8] Ensure x509 passphrase is a string @ 2018-06-05 13:27:33 UTC

    • 84100570f7 Merge pull request #47957 from garethgreenaway/47236_ensure_passphrase_is_a_string

    • 99bad3cca6 removing unnecessary change

    • e22df8473d Ensuring that when a passphrase is passed in, it is returned as a string from the passphrase callback.

      • d0cf06a24d Make sure we set the effective environment when lock_saltenv is True

  • PR #47926: (dmurphy18) Backport of PR 47808 to 2018.3, improved grains support for AIX @ 2018-06-04 19:31:24 UTC
  • PR #47927: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-06-04 18:55:12 UTC
  • PR #47931: (rallytime) Back-port #47913 to 2018.3 @ 2018-06-04 14:39:16 UTC
  • PR #47930: (rallytime) Back-port #47725 to 2018.3 @ 2018-06-04 14:38:58 UTC
  • PR #47557: (L4rS6) fix broken rabbitmq list policies in rabbitmq version 3.7 @ 2018-06-04 13:25:07 UTC
    • 484d83014b Merge pull request #47557 from L4rS6/fix-broken-rabbitmq-list-policies
    • 6d7ef27557 Merge branch '2018.3' into fix-broken-rabbitmq-list-policies
    • e043ea2833 refactored list_policies code and added more tests
    • eea81feb7b fix broken rabbitmq list policies in rabbitmq version 3.7
  • PR #47949: (terminalmage) Continued troubleshooting on salt-jenkins 1000 @ 2018-06-04 13:17:14 UTC
  • PR #47941: (terminalmage) Update test logging for salt-jenkins @ 2018-06-03 02:40:56 UTC
  • PR #47924: (Ch3LL) Catch all exceptions in git import for salt.utils.gitfs @ 2018-06-01 21:06:58 UTC
  • ISSUE #47269: (isdig) Reopen Windows Minion That Has IAM Role Cannot Access to S3 (refs: #47879)
  • PR #47879: (dwoz) Fix ami role usage warts #47269 @ 2018-06-01 14:11:55 UTC
  • PR #47788: (twangboy) Use pytz to calculate timezones @ 2018-05-31 18:33:20 UTC
  • PR #47899: (terminalmage) salt-jenkins issue 1000 @ 2018-05-31 18:24:49 UTC
  • PR #47753: (Ch3LL) Add stderr launchctl helper class and fix service mac tests @ 2018-05-31 18:16:57 UTC
  • PR #47908: (meaksh) Align SUSE salt-master.service 'LimitNOFILES' limit with upstream Salt @ 2018-05-31 18:13:27 UTC
    • 828bf39695 Merge pull request #47908 from meaksh/2018.3-align-suse-salt-master-service
    • efe308013a Align SUSE salt-master.service 'LimitNOFILES' limit with upstream Salt
  • PR #47868: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-05-30 21:20:38 UTC
  • PR #47900: (rallytime) [2018.3] Merge forward from 2018.3.1 to 2018.3 @ 2018-05-30 18:09:41 UTC
  • ISSUE #30367: (paulfanelli) salt-run orchestration via state.sls always successful; it is ignoring state return value (refs: #47843)
  • PR #47843: (garethgreenaway) [2018.3] orchestration results False when function is False (refs: #47983) @ 2018-05-30 17:21:54 UTC
    • a0bf565741 Merge pull request #47843 from garethgreenaway/30367_orch_return_false_when_function_fails
    • 09242697b8 Merge branch '2018.3' into 30367_orch_return_false_when_function_fails
  • PR #47866: (rallytime) Back-port #47814 to 2018.3 @ 2018-05-29 19:55:24 UTC
  • PR #47865: (rallytime) Back-port #47600 to 2018.3 @ 2018-05-29 19:54:44 UTC
    • PR #47600: (travispaul) Prevent crash on NetBSD and OpenBSD when no swap is configured. (refs: #47865)
    • d9e7f2b5b1 Merge pull request #47865 from rallytime/bp-47600
    • f9f464fa51 Prevent crash on NetBSD and OpenBSD when no swap is configured.
  • PR #47221: (azelezni) Fix boto_ec2 unused parameter "network_interfaces" @ 2018-05-29 14:41:35 UTC
    • 61561a8279 Merge pull request #47221 from azelezni/fix-boto_ec2-network_interfaces
    • 03ee0023eb Fix unused network_interfaces parameter
    • 1ece61ddfa Fix unused network_interfaces parameter
    • 3e074be9c3 Fixing lint
    • 02609b6e61 Adding state files for new test.
    • 377e34c689 Updating function in saltmod to ensure that the result is a failure if the function being run returns as False.
  • PR #47850: (rallytime) Fix autodoc for new swarm module @ 2018-05-26 01:53:16 UTC
  • PR #47800: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-05-26 01:17:40 UTC
  • PR #47581: (twangboy) Add get_encoding salt util @ 2018-05-25 20:40:07 UTC
  • ISSUE #47694: (thuhak) utils/boto and utils/boto3 load error (refs: #47726)
  • PR #47726: (gtmanfred) rename boto to botomod @ 2018-05-25 20:37:37 UTC
  • ISSUE #47701: (babs) elasticsearch.index_template_present state with check_definition: True fails. (refs: #47703)
  • PR #47803: (rallytime) Back-port #47703 to 2018.3 @ 2018-05-23 20:12:30 UTC
  • PR #47804: (rallytime) Back-port #47761 to 2018.3 @ 2018-05-23 20:11:55 UTC
  • PR #47776: (garethgreenaway) [2018.3] Fixes to failing before_connect tests @ 2018-05-23 15:10:35 UTC
    • 1efe891c42 Merge pull request #47776 from garethgreenaway/970_two_minion_unit_tests_failing
    • a5011b49ab Merge branch '2018.3' into 970_two_minion_unit_tests_failing
    • ef24f72169 Fixing unit.test_minion.MinionTestCase.test_beacons_before_connect and unit.test_minion.MinionTestCase.test_scheduler_before_connect.
  • PR #47783: (rallytime) [2018.3] Merge forward from 2018.3.1 to 2018.3 @ 2018-05-23 14:51:56 UTC
  • PR #47149: (meaksh) [2018.3] Strip trailing commas on Linux user's GECOS fields @ 2018-05-22 21:18:49 UTC
    • f8a6a85d28 Merge pull request #47149 from meaksh/2018.3-remove-trailing-commas-on-linux-user-gecos-fields
    • 60ec3230db Merge branch '2018.3' into 2018.3-remove-trailing-commas-on-linux-user-gecos-fields
  • ISSUE #46938: (racooper) Beacons documentation update for 2018.3 (refs: #47740)
  • PR #47740: (garethgreenaway) [2018.3] Updating Beacon topic to include list based configuration for Beacons @ 2018-05-21 13:58:01 UTC
    • 19f4137b63 Merge pull request #47740 from garethgreenaway/46938_beacons_documentation
    • 5d23ef4dd8 Updating Beacon topic to include list based configuration for Beacons
  • PR #47710: (terminalmage) salt.loader: add error logging when whitelist lookup fails @ 2018-05-18 16:56:18 UTC
    • 22807ac756 Merge pull request #47710 from terminalmage/fix-loader-whitelist
    • 6192391b7b Add additional missing modules to whitelist
    • 7192c38f66 Change key -> function to make log message more clear
    • 91f9fd38fd Fix loader whitelists in unit tests
    • d4f2662e5b Add error logging when whitelist lookup fails
  • PR #47680: (rallytime) [2018.3] Merge forward from 2018.3.1 to 2018.3 @ 2018-05-17 21:30:27 UTC
  • PR #47545: (dmurphy18) Fix non-root build and signing for rpm packages @ 2018-05-17 21:20:10 UTC
    • dbf12f9be2 Merge pull request #47545 from dmurphy18/fix_nonroot_build
    • 220f887fa6 Fixed review comment, changed file.chown to file.makedirs_perms
    • b15a1652b5 Changed versionadded from 2018.3.1 to 2018.3.2, to reflect when change should be accepted
    • 90eb03e375 Additional error checking and minor cleanup
    • 40d77e03d2 Correct building rpms with non-root user
  • ISSUE #47546: (ender8282) archive.extracted fails when archive includes files with non-ascii names with 2018.3.0 (refs: #48015, #47572)
  • PR #47572: (garethgreenaway) [2018.3] archive module, filenames with Unicode characters @ 2018-05-17 20:41:11 UTC
    • 69056e5b67 Merge pull request #47572 from garethgreenaway/47546_archive_non_ascii_filenames
    • 5e97b8b44a Updating with requested changes.
    • cc1aa75a2f only convert to bytes when using Python2
    • 0fe32f4066 Updating integration/modules/test_archive to include filenames with unicode characters.
    • 5a9cadd125 Accounting for when files in an archive contain non-ascii characters
  • PR #47661: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-05-16 15:53:36 UTC
  • PR #47672: (terminalmage) Backport #47487 to 2018.3 @ 2018-05-16 13:55:40 UTC
  • ISSUE #47501: (mateiw) salt-ssh doesn't propagate pillar when overriding pillar in module.run + state.apply (refs: #47504)
  • PR #47504: (mateiw) Fix pillar propagation in salt-ssh when overriding pillar in module.run + state.apply @ 2018-05-16 13:55:05 UTC
    • 9d4f5203a7 Merge pull request #47504 from mateiw/2018.3-salt-ssh-pillar-propagation-issue-47501
    • 3ffa412ee5 Merge branch '2018.3' into 2018.3-salt-ssh-pillar-propagation-issue-47501
    • 2f1485e067 Option to merge current pillar with opts['pillar'] during pillar compile
  • PR #47212: (weswhet) fix macOS running as user. @ 2018-05-16 13:54:23 UTC
    • 4fe78bbb9b Merge pull request #47212 from weswhet/fix-macos-runas
    • 8ee11d74af Merge branch '2018.3' into fix-macos-runas
    • e78fa45927 adding in requested changes
    • 33c1492099 Merge branch '2018.3' into fix-macos-runas
    • 0ecabcae78 adding in a fix for running commands as a user on macos
  • ISSUE #47587: (FedericoOlivieri) --out=table broken in 2018.3.0 'str' object but received a 'unicode' (refs: #47674)
  • PR #47674: (terminalmage) Fix regression in table outputter due to unicode types @ 2018-05-16 13:41:04 UTC
    • 0c7439a955 Merge pull request #47674 from terminalmage/issue47587
    • 43e3dcd398 Fix Python 3 incompatibility in table outputter
    • d729656703 Add unit tests for table outputter
    • 907d182dea Fix regression in table outputter due to unicode strings
  • PR #47617: (aesposito91) Update napalm.py @ 2018-05-15 15:44:35 UTC
  • ISSUE #46871: (guettli) Sentry Logging Handler (refs: #47649)
  • PR #47649: (paulcollinsiii) Some additional details about Sentry for the docs @ 2018-05-15 15:41:36 UTC
    • 049abe2850 Merge pull request #47649 from paulcollinsiii/sentry_docs
    • 2a8dfd65d7 Some additional details about Sentry for the docs
  • PR #47642: (garethgreenaway) [2018.3] Updating templates used by salt-extend for unicode goodness @ 2018-05-15 15:38:26 UTC

    • 8a21b864df Merge pull request #47642 from garethgreenaway/unicode_update_salt_extend_templates

    • 68d73f7afc Updating the templates that the salt-extend utility uses to include unicode_literals & print_function

      • 0232a6e1ad Add 'other' as valid kwargs for 'user.add' method
      • ff861d9089 Merge branch '2018.3' into 2018.3-remove-trailing-commas-on-linux-user-gecos-fields
  • PR #47603: (terminalmage) Move/merge more test modules @ 2018-05-14 20:48:43 UTC
  • PR #47640: (rallytime) [2018.3] Merge forward from 2018.3.1 to 2018.3 @ 2018-05-14 17:59:06 UTC

    • cc3daa88f3 Merge pull request #47640 from rallytime/merge-2018.3

    • 2827c56399 Merge branch '2018.3.1' into '2018.3'

      • f1680f1d9b Do make comparisons in a single line
      • 7dea455c12 Add unit test for new method 'user.chother'
      • 694882632c Add 'other' attribute to GECOS fields to avoid inconsistencies with chfn
      • 6c089c9de1 Fix unsupported chars checking on GECOS fields
      • d5c9ca0fbc Add unit tests for GECOS fields
      • ed940c4f58 Strip trailing commas on Linux user GECOS fields
  • PR #47589: (Ch3LL) Remove duplicate file id in watch_any doc example @ 2018-05-10 22:06:00 UTC
    • 4ec63dd041 Merge pull request #47589 from Ch3LL/watch_any_doc
    • 8cb97a48f5 Add additional state to watch_any doc example
    • f7223a3bbf Remove duplicate file id in watch_any doc example
  • PR #47564: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-05-10 19:13:36 UTC
  • PR #47565: (rallytime) Back-port #47440 to 2018.3 @ 2018-05-10 18:15:50 UTC
  • PR #47590: (Ch3LL) Fix firewalld prune_services deprecation warning @ 2018-05-10 17:01:48 UTC
  • PR #47568: (terminalmage) salt.serializers.yaml/yamlex: remove invalid multi_constructor (refs: #47598) @ 2018-05-10 16:21:09 UTC
  • ISSUE #38671: (MikeSpaceG) zpool.get error (refs: #47224)
  • PR #47563: (rallytime) Back-port #47224 to 2018.3 @ 2018-05-10 16:18:07 UTC
  • PR #47569: (Ch3LL) Update salt.utils.path mock in virtual core test @ 2018-05-10 15:18:31 UTC
  • PR #47576: (rallytime) [2018.3] Small Documentation Fixes @ 2018-05-10 14:08:11 UTC
    • fc93715eea Merge pull request #47576 from rallytime/doc-updates
    • ca927fc14b Add extra lines that are needed for proper code-block formatting
    • b330d763a4 Remove infoblox state autodoc file