neulab/tldr huggingface dataset:
• PR #49240: (dwoz) file state test fixes (refs: #49362, #49441)
• 1f4906346a Merge pull request #49441 from rallytime/bp-49240
• 22ed452479 Work around listdir encoding issues on py2 windows
• f5be275835 file state test fixes
• PR #49440: (rallytime) Back-port #49258 to 2018.3.3 @ 2018-08-30 18:02:25 UTC
• PR #49258: (gtmanfred) flaky tests are flaky (refs: #49440)
• cc27b67a37 Merge pull request #49440 from rallytime/bp-49258
• 0191af1423 flaky tests are flaky yo
• 720b671dda mark orchestration state tests as flaky
• 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 #49322: (dwoz) Encode shell commands explicitly. (refs: #49368)
• af80e64569 Merge pull request #49368 from rallytime/bp-49322
• 238853b9ec Encode shell commands explicitly.
• PR #49363: (rallytime) Back-port #49245 to 2018.3.3 @ 2018-08-28 17:14:18 UTC
• PR #49245: (dwoz) Skip grep unit tests on windows (refs: #49363)
• 0fee3e8786 Merge pull request #49363 from rallytime/bp-49245
• cc606509d0 Fix is_windows call - use the right path
• 5488fbea38 Skip grep unit tests on windows
• PR #49361: (rallytime) Back-port  #49244 to 2018.3.3 @ 2018-08-28 17:12:58 UTC
• PR #49244: (dwoz) Test fixes: unit.fileserver.test_gitfs (refs: #49361)
• dbcd2fc726 Merge pull request #49361 from rallytime/bp-49244
• e0909d3a25 Simplify by using to_unicode helper
• 4723c69092 Older GitPython version do not have a close method
• d5fecba716 Fix up fileserver.test_gitfs tests on windows
• 4b688f6347 Remove unicode filenames on windows python 2
• PR #49362: (rallytime) Back-port #49240 to 2018.3.3 @ 2018-08-28 17:00:25 UTC
• b4a1e1d365 Merge pull request #49362 from rallytime/bp-49240
• 16ca5b9694 Work around listdir encoding issues on py2 windows
• 7650208dbc file state test fixes
• PR #49365: (rallytime) Back-port #49270 to 2018.3.3 @ 2018-08-28 16:56:23 UTC
• PR #49270: (dwoz) Add async helper to test_sock_path_len (refs: #49365)
• 9ca9a775ff Merge pull request #49365 from rallytime/bp-49270
• 1b3f37a8b8 Add async helper to test_sock_path_len
• PR #49364: (rallytime) Back-port #49243 to 2018.3.3 @ 2018-08-28 16:55:55 UTC
• PR #49243: (dwoz) Revert newline translation change (refs: #49364)
• bbff57da16 Merge pull request #49364 from rallytime/bp-49243
• 5db77c6229 Revert newline translation change
• PR #49347: (Ch3LL) [2018.3.3] Backport #49345 @ 2018-08-28 01:54:00 UTC
• PR #49345: (gtmanfred) upgrade including linux kernels (refs: #49347)
• 74b78835b3 Merge pull request #49347 from Ch3LL/bp_49345_2018.3.3
• 7bf5ba83c8 upgrade including linux kernels
• PR #49323: (Ch3LL) Skip nonexistent branch test for git versions <1.7.10 @ 2018-08-25 19:52:48 UTC
• be6691d91b Merge pull request #49323 from Ch3LL/skip_git
• ee3d32f74e Skip nonexistent branch for git versions <1.7.10
• 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
• PR #49236: (terminalmage) Allow compound matching in eauth config expressions (refs: #49313)
• 64d7b0e4c6 Merge pull request #49313 from rallytime/bp-49236
• 1a5ef996e3 Add 'minion_data_cache: True' to mocked opts for minions unit tests
• 549f5d5a86 Allow compound matching in eauth config expressions
• PR #49311: (rallytime) Back-port #49303 to 2018.3.3 @ 2018-08-24 17:48:23 UTC
• PR #49303: (gtmanfred) use os._exit instead of sys.exit when daemonizing (refs: #49311)
• 7a89a4c8aa Merge pull request #49311 from rallytime/bp-49303
• 3fe1387751 use os._exit instead of sys.exit when daemonizing
• PR #49294: (Ch3LL) Move run_function call from __init__ to setup @ 2018-08-24 12:41:35 UTC
• 7bb356f11e Merge pull request #49294 from Ch3LL/fed_28_tests
• 0a5d44a3db Move run_function call from __init__ to setup
• PR #49302: (twangboy) Fix installer 2018.3.3 @ 2018-08-24 12:41:14 UTC
• a607f9332f Merge pull request #49302 from twangboy/fix_installer_2018.3.3
• 68fd37575e Fix erroneous NSSM reference
• 103f2c289e Remove delete vcredist line
• 007a16638e Bring installer updates from 2017.7.8 to 2018.3.3
• PR #49241: (terminalmage) Don't silently catch SystemExit @ 2018-08-22 12:57:58 UTC
• bc0b4ac513 Merge pull request #49241 from terminalmage/salt-jenkins-1078
• 08d144f2c7 Don't silently catch SystemExit
• c0fdb818f7 Don't use a bare except!
• PR #49239: (Ch3LL) Use yaml's safe_dump in windows ec2 tests @ 2018-08-22 08:48:13 UTC
• 0fb9ccf60a Merge pull request #49239 from Ch3LL/win_yaml_test
• f5b42dbb24 import salt.utils.yaml
• 67290eaff7 Use yaml's safe_dump in windows ec2 tests
• PR #49182: (terminalmage) Fix hanging syndic test @ 2018-08-18 12:10:32 UTC
• 134f125b96 Merge pull request #49182 from terminalmage/salt-jenkins-1078
• a2d2cd317b Fix hanging syndic test
• PR #49172: (Ch3LL) [2018.3.3] cherry pick #49118 @ 2018-08-17 20:54:05 UTC
• PR #49118: (dwoz) Multiple fixes for integration.states.test_file (refs: #49172)
• PR #49088: (dwoz) Multiple file state test fixes (refs: #49118)
• PR #49087: (dwoz) Filter out scheme's that are not valid (refs: #49118)
• b3a247bfbb Merge pull request #49172 from Ch3LL/bp-49118
• ce5e17bdbd update is_windows salt.utils to correct path
• 3fef112409 Multiple fixes for integration.states.test_file
• PR #49173: (Ch3LL) [2018.3.3] cherry pick #49167 @ 2018-08-17 20:30:27 UTC
• 85ffc8db87 Merge pull request #49173 from Ch3LL/bp-49167
• a1a298a13c Simplify dict keys lookup
• 3d26affa10 Fix remaining file state integration tests (py3)
• PR #49171: (Ch3LL) [2018.3.3] cherry pick #49103 @ 2018-08-17 20:23:32 UTC
• PR #49103: (dwoz) Install the launcher so we can execute py files (refs: #49171)
• ee54ea5f73 Merge pull request #49171 from Ch3LL/bp-49103
• 05a2b91fb2 Install the launcher so we can execute py files
• 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
• 01f8f83cf0 Merge pull request #49142 from Ch3LL/rm_z_arg
• a1ef6a88a6 Remove -Z script_arg for cloud tests
• 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
• b412bff534 Merge pull request #49110 from rallytime/merge-2018.3
• 4649f60209 Update old utils paths with new paths
• 49c2a784bb Merge branch '2017.7' into '2018.3'
• d46e23f4c2 Merge pull request #49109 from rallytime/merge-2017.7
• 3c5527f300 Merge branch '2017.7.8' into '2017.7'
• 01cf2c71ff Merge pull request #49051 from rallytime/bp-49046
• fc0817cb35 The osfullname grain differs when using Python2 vs Python3, swapping this out for the "OS" grain which is consistent.
• 8954dd269f Merge pull request #49090 from dwoz/file_line_fix
• 0dca634e3c Search for (but do not include) CRLF line ending
• b99edc3dce Merge pull request #49088 from dwoz/file_hash_diffs
• 054afb8197 Multiple file state test fixes
• 274977b6c4 Merge pull request #49087 from dwoz/url_file_test_fixes
• 632b65f975 Filter out scheme's that are not valid
• db5fb3232a Merge pull request #49086 from rallytime/new-doc-img
• 90954203cb Update the DOCBANNER image for saltconf
• af6ec1dce2 Merge pull request #49045 from twangboy/fix_43164
• 589456d08f Fix lint errors
• e79243566d Add rallytime's suggestions
• d1ae6b3d6d Fix docs for the registry module and state
• a840fea1a1 Merge pull request #49083 from rallytime/bootstrap-2017.7
• 358e14cdac [2017.7] Update bootstrap script to latest release
• 9db6cd5654 Merge pull request #49059 from twangboy/fix_37984
• 7ed45b5b00 Remove import
• 7fb1edb469 Fix docs to clarify uptime output on Windows
• f9db72f00c Merge pull request #49061 from saltstack/revert-48982-new_logo_2017.7
• 98a8da728b Revert "New logo 2017.7 (WIP)"
• bbcd1869ec Merge pull request #48982 from newwebash/new_logo_2017.7
• 5c1c311f77 Update Salt Conf ad
• 72dc63c426 Merge branch '2017.7' of https://github.com/saltstack/salt into new_logo_2017.7
• 9f4e78a7b9 Revert "Update saltconf ad"
• 3ab8cdb882 Update saltconf ad
• 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
• PR #49085: (gtmanfred) fix async call to process manager (refs: #49099)
• 484c1e0123 Merge pull request #49099 from rallytime/bp-49085
• 024d9cb843 fix async call to process manager
• 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 #49075: (gtmanfred) fix last async issue (refs: #49077)
• 90c2f026b3 Merge pull request #49077 from rallytime/bp-49075
• 5e07b8306b fix last async issue
• PR #49096: (rallytime) Update the DOCBANNER image for saltconf @ 2018-08-13 19:59:39 UTC
• 6942ef1102 Merge pull request #49096 from rallytime/new-doc-img-2018.3
• 75080705ce Update the DOCBANNER image for saltconf
• PR #49055: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-08-13 19:20:11 UTC
• 0e1ed7b923 Merge pull request #49055 from rallytime/merge-2018.3
• 83a15cb623 Add optimization_order config to mocked opts
• ea6883ee55 Update old utils paths to new utils paths
• 201031fa8a Merge branch '2017.7' into '2018.3'
• 0d2a495378 Merge pull request #49050 from rallytime/merge-2017.7
• ed6fb8b739 Merge branch '2017.7.8' into '2017.7'
• 189e28691f Merge pull request #49044 from Ch3LL/vultr_test
• 0dedfae4d1 increase timeout on vultr cloud integration test
• c606a32cf2 Merge pull request #49042 from rallytime/flaky-jinja-test
• a43d9b4ba6 Mark a jinja template test as flaky
• 6415b6f73b Merge pull request #49041 from Ch3LL/ec2_fix
• cf7f2459b8 [2017.7.8] backport PR #48212
• 1db036406b Merge pull request #49030 from rallytime/update-client-tests
• f08ee6c6ae Update netapi client tests
• 70be9ac9b1 Merge pull request #49046 from garethgreenaway/1022_fixing_test_failing_py3_Debian_test
• fa2339bb91 The osfullname grain differs when using Python2 vs Python3, swapping this out for the "OS" grain which is consistent.
• 69c9b0afb1 Merge pull request #49036 from cspeidel/doc-fix-netyang
• f7ac085eb5 minor doc fix in netyang.py
• c5f3fd6b2b Merge pull request #48997 from AVeenstra/patch-1
• 0e535f2c8c Unpacking dict with the six iterator
• 5e82685b89 Python 3 related fix in highstate_return.py
• c06a3cf531 Merge pull request #49021 from rallytime/merge-2017.7
• ca82b3d57a Merge branch '2017.7.8' into merge-2017.7
• f73ba21bc7 Merge pull request #49024 from rallytime/fix-deb-test
• a9c16d9137 Fix test error in test_compiler jinja check
• c6f8429e41 Merge branch '2017.7.8' into '2017.7'
• 6b6d68c615 Merge pull request #49020 from rallytime/fix-grains-test
• f72a3ac6be Make grains integration test more robust
• 92d6c25c7f Merge pull request #49002 from rallytime/skip-jinja-deep-error-test
• 23b66ef8bb Skip test_jinja_deep_error on Debian 8
• 41d9f11eb3 Merge pull request #48999 from rallytime/fix-boto-test
• d0136b1be5 Update expected return value in boto test
• 2ddba6391a Merge pull request #49010 from Ch3LL/univention
• c09bce9afe Add univention OS to debian os_family mapping
• 41bd36842e Merge pull request #48636 from terminalmage/loader-fixes
• 0441cd56ef Add optimization_order to mocking
• 2256fad320 Process pycache files after .py files
• a78663a301 Lint
• 0728b5f8b6 Add note about Python 3.5+ only support for optimization_order
• 764969ce08 Add a test to confirm that .py files are still loaded correctly
• 0f60beb6b6 Fix bad copypasta
• fbcd142ea2 Add configuration docs for optimization_order config option
• 8af2d580f3 Only compile the suffix_order/map once per LazyLoader instance
• 4b95e5f313 Don't put __pycache__ dir in the file list
• e7c10196da Quiet the byte compiling for PY2
• 9338370477 Add unit tests for loader optimization levels
• c3622933c1 PY3: Support different optimization levels
• 6fc8da5bab Add optimization_order config option with default value
• dfe423a1e0 Remove commented-out log message
• 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
• b0d5acbe0d Merge pull request #49052 from isbm/isbm-python37-support-2018.3
• 4386a9ca1f Merge branch '2018.3' into isbm-python37-support-2018.3
• bc85a5fa98 Fix configuration setting
• 47078a300f Remove async keyword, moving it into the kwargs.
• 31dccc4fdf fix unicode literals
• 990936992c Keep runner API unchanged
• 46bafcafef Fix nag-message
• 5c887ac2ae Support original API
• 2c22e794d4 Use kwargs instead of directly named parameters
• 7d095491d9 Update docstring
• 9807e8dbb7 Add 'async' backward compatibility
• e8608aa9be Revert api call: it is about "functionname_async" suffix.
• 0543578336 Deprecate 'async' parameter in Mandrill API
• 1107de0dec Lintfix: PEP8 requires two empty lines
• 2a18e335af Fix function signatures in Cassandra module
• 603f94e2a3 Cleanup docstrings at module level
• b9718d3a09 Fix log error/info/warning and exception messages
• 6e77aff69a Fix local opts from CLI
• 493e48ddb5 Remove internal variables/properties with the reserved words
• be07f64bc4 Change internal function signatures to avoid reserved word
• 7d095e0b26 Rename async function to asynchronous
• 35eaebb8a4 Fix docstrings
• 7a597f19b5 Fix comments
• 69920366ae Fix CLI config
• 173f3d7aa8 Fix docstring typo
• b7da571624 Fix imports
• 7ec3954bef Rename module to full wording
• 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
• 338ecb70ef Merge pull request #49026 from dwoz/issue_48557
• a4d22fda2f Merge remote-tracking branch 'origin/issue_48557' into issue_48557
• 702e76cfc9 Merge branch '2018.3' into issue_48557
• 6cf93e8fc4 Skip newline in binary mode
• 2cf80c1595 Fix linter errors
• baf291b4c8 Fix file.line line endings
• 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
• 4eeb75f028 Merge pull request #49033 from terminalmage/issue48996
• 163aea71c8 Lint
• d6e5038022 Fix file.get_diff for remote files
• 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
• 7d6b9ed0a5 Merge pull request #48803 from dmurphy18/aix_filesystems
• 92818f816b Fixes for testing
• 77dd7a1743 Adjust unit tests
• eaed033cde Updated for review comments and adjusted locking when writing files
• 5bf9e6085b Update due to review comments
• 9fb5641dc7 Mount unit tests for modules and states for AIX
• b28f427432 Save off work after laptop issue
• e5c2741fe7 module and states mount support for AIX
• b701e16ad0 Further updates to support for mount on AIX
• 210076276f Initial support for handling /etc/filesystems on AIX
• 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
• 2a38905a8a Merge pull request #48929 from terminalmage/issue48496
• 7ac10f9eac 2 salt-key fixes
• 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
• bb9d23bfa1 Merge pull request #49022 from dwoz/47481_docs
• 313a3d93d6 Document time format idiosyncrasies
• PR #48932: (twangboy) Fix pkg.install when pkg already installed @ 2018-08-09 17:45:51 UTC
• 9b6a9ff4f1 Merge pull request #48932 from twangboy/fix_win_repo
• 075ea29d29 remove .lower(), fix debug messages
• d7c2f476ac Remove current: version for latest as well
• 522ac26459 Fix typo in code comment
• 47b2898a85 return empty dict on no changes
• 6532706d2f Make the tests run on Linux
• cfe55a391a Add tests for pkg.install output
• 8ec058f498 Clarify code comment
• 8af2cfd54a Fix issues where current is not returned
• 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
• df8699e2e7 Merge branch '2017.7.8' into '2017.7'
• a1e54634dc Merge pull request #48976 from rallytime/tornado
• 0bd838ab6c Skip unreliable tornado tests
• 22713be9c1 Merge pull request #48979 from rallytime/bp-48959
• 03aa0e49b0 Merge pull request #48970 from Ch3LL/back_48962
• 3ce1b8a3c9 Update the elif block to only be true for versions below Debian 9.
• e6cea5e3c7 Merge pull request #48968 from rallytime/man-pages
• 64fe3be41a Update man pages for 2017.7.8 release
• 10fd4661ff Merge pull request #48978 from gtmanfred/2017.7
• 6108363f82 clean up gemfile
• 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
• 94ac2b4fc7 Multiple block replace test fixes
• 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
• 57aa204c9d Merge branch '2017.7' into bp-48730
• 4995922584 Forgot variable in signature
• 0503bc18b6 Fix batch install using pkgng
• 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
• 8ca89df7e8 Update backticks on job_cache docs
• 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
• a56bc7ffb9 Merge pull request #49023 from The-Loeki/patch-1
• 8b53571c70 Salt SSH appends IdentityFile=agent-forwarding
• 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 #48999: (rallytime) Update expected return value in boto test (refs: #49004, #49003)
• b87bf905c2 Merge pull request #49004 from rallytime/boto-test-2018.3
• 9f0b9a1073 Update expected return value in boto test
• PR #48987: (twangboy) Fix issue with win_iis.create_cert_binding @ 2018-08-08 13:29:06 UTC
• 630f61e625 Merge pull request #48987 from twangboy/fix_48786
• 86d0836f90 Fix issue with iterating over None
• 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
• bad995462c Merge pull request #48956 from gtmanfred/openstack
• 4cb1636c4b if booted from volume, use string from image
• 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
• 71f587edd7 Merge pull request #48319 from gtmanfred/jid
• 084e7f0ef4 Merge branch '2018.3' into jid
• 60661b4cd0 document minions required on save_load
• a8c243071d document passing in minions
• d49381c0b6 don't break save_load backwards compat
• cfcacf953a don't break older returners right now
• PR #48941: (rallytime) Back-port #48912 to 2018.3 @ 2018-08-06 13:09:38 UTC
• PR #48912: (maxim-sermin) make jboss7.py compatible with 2018.3.0 and later (refs: #48941)
• 1623e53ef4 Merge pull request #48941 from rallytime/bp-48912
• 3f55b2f89e make jboss7.py compatible with 2018.3.0 and later
• PR #48897: (rallytime) Back-port #48863 to 2018.3 @ 2018-08-05 19:15:51 UTC
• PR #48863: (admd) Decode file contents for python2 as well (refs: #48897)
• 070af9d925 Merge pull request #48897 from rallytime/bp-48863
• 0ee1940232 Merge branch '2018.3' into bp-48863
• f40b966d99 decode file contents for python2 as well
• PR #48928: (Ch3LL) fix test_runas integration test for macosx @ 2018-08-05 14:24:13 UTC
• abd7f1312d Merge pull request #48928 from Ch3LL/mac_runas
• 3d6455dbcd remove unecessary comment in setup
• 8e30db0217 move destructivetest to testname
• 708dec8740 add destructivetest to setup and teardown for runas test
• c0730ff968 fix test_runas integration test for macosx
• PR #48899: (Ch3LL) remove base_top_file file in teardown and add sleep @ 2018-08-05 14:23:42 UTC
• dbd300ff70 Merge pull request #48899 from Ch3LL/unit_state
• 0272cadff8 Merge branch '2018.3' into unit_state
• 5896c7fc36 remove base_top_file file in teardown and add sleep
• PR #48898: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-08-05 14:23:19 UTC
• ffa1fcc682 Merge pull request #48898 from rallytime/merge-2018.3
• 1f093cef4a Merge branch '2018.3' into merge-2018.3
• b3a5aa49d7 Merge branch '2017.7' into '2018.3'
• e79ccb35b1 Merge pull request #48876 from Vaelatern/make-network-learning-optional
• a4905b0e5d Make IP_LEARNING optional
• f8bfab4f9f Merge pull request #48890 from Ch3LL/cmd_test
• acda4ed9ab add sleep in test_cmd integration test
• 52722f6ded Merge pull request #48885 from rallytime/flaky-tests-shadow
• da871a2d57 Mark shadow module integration test as flaky
• bf0895656e Merge pull request #48884 from rallytime/flaky-tests-matchers
• 38d9eae537 Merge branch '2017.7' into flaky-tests-matchers
• a567666938 Merge pull request #48868 from terminalmage/fix-loader-race
• 5f1169b9a2 Fix race when SIGTERM/SIGINT received while lazyloading a module
• 0ca0b6f2f2 Merge pull request #48883 from terminalmage/salt-jenkins-1023
• c61f75cb50 Fix failing git worktree tests
• 3660dff13c Separate compound matcher tests into individual tests
• a84f5155a1 Merge pull request #48869 from Ch3LL/mac_shell_tests
• 3734b1ec89 Catch socket.error exception in testprogram
• 7f56b8bf44 Merge pull request #48867 from rallytime/skip-tornado-test
• 7320aa9104 Skip unreliable tornado test.
• PR #48893: (Ch3LL) handle when ca_certs is None in utils.http @ 2018-08-03 20:30:48 UTC
• 848e26ed0b Merge pull request #48893 from Ch3LL/http_tests
• 16d251f7ff Merge branch '2018.3' into http_tests
• 5674dddb2a handle when ca_certs is None in utils.http
• PR #48903: (Vaelatern) Wrap ElementTree.tostring to make strs, not bytes @ 2018-08-03 19:12:34 UTC
• PR #48877: (Vaelatern) Wrap ElementTree.tostring to make strs, not bytes (refs: #48903)
• f1adf56017 Merge pull request #48903 from Vaelatern/improve-salt-cloud-python3-virt
• c45447fe0b Wrap ElementTree.tostring to make strs, not bytes
• PR #48900: (Ch3LL) skip getpwnam check on mac in unit test_cmdmod @ 2018-08-03 16:38:51 UTC
• d23471262d Merge pull request #48900 from Ch3LL/cmd_unit
• b82dd708be skip getpwnam check on mac in unit test_cmdmod
• PR #48921: (rallytime) Back-port #48904 to 2018.3 @ 2018-08-03 15:17:15 UTC
• PR #48904: (KaiSforza) No rehashing in parallel (refs: #48921, #48920)
• d622a49b58 Merge pull request #48921 from rallytime/bp-48904
• b504625f61 No rehashing in parallel
• 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) Explictly document the configuration override priority @ 2018-08-02 16:57:18 UTC
• ec8e07e8ce Merge pull request #48888 from terminalmage/issue37512
• 7dce7cde14 Explictly document the configuration override priority
• PR #48871: (dwoz) Remove unicode key pairs from environ after test @ 2018-08-01 22:33:41 UTC
• d4bb3a0963 Merge pull request #48871 from dwoz/test_cleanup
• f2e15e7f1d Do not re-define tearDown
• 4f8a191a69 Remove unicode key pairs from environ after test
• 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 identation, 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
• 3c8f5f5b3d pylint fix
• 5539eff39e Excluding relative dirs in state.file.retention_schedule
• 1fc04f281b Merge pull request #48840 from gtmanfred/docs
• 8d2d268c4a fix links in pkg doc.
• 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
• de95a6a215 add unused import to timezone test file
• 22e424859e add unused import to import
• 0840fc3117 disable pylint import error
• f09d1a2c7e Add timzeon windows integration tests and fix get_zone
• 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
• 9fda70b3d0 Merge pull request #48814 from isbm/isbm-2018.3-smbios-bugfix
• 5f1141dc05 Merge branch '2018.3' into isbm-2018.3-smbios-bugfix
• b00ee5feef Update clean clause
• b1b2e9c222 Remove multiple returns and combine logic to just one clause
• fd77f760ee Rephrase explanatory comment
• 1031e06443 Remove unnecessary code
• c379b7e4ed Get rid of global variable
• PR #48804: (Ch3LL) Use brew path from which cmd in mac_brew module @ 2018-07-31 20:24:33 UTC
• 3d16a63ff2 Merge pull request #48804 from Ch3LL/mac_brew
• e818c752b3 Merge branch '2018.3' into mac_brew
• 41e3d17f29 Use brew path from which cmd in mac_brew module
• PR #48836: (dwoz) Fix unicode directory listing on py2 @ 2018-07-31 20:22:53 UTC
• 950c1014aa Merge pull request #48836 from dwoz/unicode_names_py2
• 47e158b9f0 Optomize if statement
• 9b462394b2 Fix unicode directory listing on py2
• 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
• 644a1f4ff8 Merge pull request #48587 from twangboy/fix_lgpo
• a42621c817 Write file in normal mode
• bfcbdeca3b Fix lgpo issue on Py3
• PR #48796: (Ch3LL) Remove fake su used in integration tests @ 2018-07-31 17:08:54 UTC
• 2bacc23481 Merge pull request #48796 from Ch3LL/remove_su
• d3b7f2cb18 Remove fake su used in integration tests
• 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 trasfer 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
• 16ca4ec2eb Merge pull request #48822 from Ch3LL/ssh_2018_id
• 01f6a15da0 Fix salt-ssh state.sls_id TypeError key must be a string
• 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 #48757: (kuetrzi) Update carbon_return.py (refs: #48791)
• 488f6716d4 Merge pull request #48791 from rallytime/bp-48757
• f440ebe91f Update carbon_return.py
• PR #48799: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-07-27 21:30:13 UTC
• fae29f4257 Merge pull request #48799 from rallytime/merge-2018.3
• 487458ad4b Update old utils paths to use new utils paths
• 436510796f Merge branch '2017.7' into '2018.3'
• 8e61f3dce0 Merge pull request #48742 from frogunder/45014
• f08058b043 Merge branch '45014' of https://github.com/frogunder/salt into 45014
• 757fde70c6 Merge branch '2017.7' into 45014
• 33c20c1ec0 fix tests
• a7a914060d add windows integration tests for states.file
• d74f47b340 Merge pull request #48795 from rallytime/fix-48417
• 5123b17ffd Update linting docs to contain .testing.pylintrc use
• bbea9ae936 Merge pull request #48789 from rallytime/bp-48783
• 682a05bebe Threshold was wrong
• d4ca0e3a97 test: except for OSError only
• 4547231909 Only run lint checks against changed files
• 41464d4b39 Merge pull request #48731 from zer0def/virt-runner-init-args
• a1fa081ad0 Documentation to missing parameters in virt.init runner.
• 365ebdf539 Fixed enable_vnc runner arg being passed into seed_cmd module arg in virt.init.
• 169afea16a Merge pull request #48749 from Ch3LL/logo_docs
• 73b1fc29f0 Update Saltstack Logo banner on docs.saltproject.io
• 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
• bd67d2a805 Merge pull request #48765 from FedericoCeratto/fix_mine.get_not_returning_data
• 7183a6e0e8 Workaround for #48020
• PR #48747: (rallytime) [2018.3] Merge forward from 2017.7 to 2018.3 @ 2018-07-26 18:14:34 UTC
• 6978ce5d1d Merge pull request #48747 from rallytime/merge-2018.3
• 4122da40b5 Merge branch '2017.7' into '2018.3'
• 781c6a6c36 Merge pull request #48743 from rallytime/saltconf-ad-2017.7
• 6df8fd8652 Update DOCBANNER with new SaltConf18 image
• ce4e22224e Merge pull request #48720 from Ch3LL/mac_file_path
• 01d25fae19 Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path
• 4b9f037d43 Merge pull request #48719 from Ch3LL/service_mac_state
• f44a2fc349 Enable service if disabled before running state service tests
• b2431eab10 Merge pull request #48715 from rallytime/flaky-tests
• 7332cce567 [2017.7] Mark some tornado tests as flaky
• 801eae3b8d Merge pull request #48672 from frogunder/45012
• 0747f2e58a add service enabled test
• 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
• 5ea43817ab Merge pull request #48771 from gtmanfred/2018.3
• 535fb8f8e7 only do reverse dns lookup on ips for salt-ssh
• 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
• 19afa3b023 Merge pull request #48760 from dwoz/test_file_fixes
• a89019e956 Multiple windows test fixes
• PR #48753: (dwoz) Finally fix prepend for real @ 2018-07-25 00:07:15 UTC
• e6dace3959 Merge pull request #48753 from dwoz/fix_prepend
• 0d1e8ab3f8 Merge branch '2018.3' into fix_prepend
• PR #48756: (dwoz) os.uname is not available on py2 windows @ 2018-07-24 23:38:32 UTC
• 8aef6d9960 Merge pull request #48756 from dwoz/core_grains_fix
• b7a37ecf11 os.uname is not available on py2 windows
• 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: explicitely 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
• ead19725b6 Merge branch '2017.7' into fix_48169
• 653fbcb383 Fix some docs errata
• 8898e5ff11 Add warn_until Fluorine
• 707906ac15 Fix unit.state.test_powercfg
• 32c5014eb6 Fix unit tests
• 0d9c56e540 Add some more logging
• b20453de9f Use minutes to set
• 7dc7eb11c2 Fix documentation to denote seconds when setting
• 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
• e30d17099d Use goto instead of if statement
• e1042fa084 Remove vcredist for Py3
• 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
• f590eb2b02 Update state.py
• 9790ee3d0d Follow up to PR #48555
• 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
• c78efab828 Fix mac service.disable tests
• 93d2f51d2b Merge pull request #48658 from wyardley/wyardley-npm-json-output-2017
• 7ff3c9c5ff Improve handling of npm json output (#43138)
• 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
• 5ace9f01ec Fix NameError in testinfra module
• 0d4c80205f Merge pull request #48651 from gtmanfred/pylint-2017.7
• b6ee52f859 handle pyzmq for python3.4
• 160ae29cf2 Merge pull request #48647 from gtmanfred/pylint-2017.7
• ff818c4ca2 disable checks on pylint
• 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
• cb654bbf2c Add timeouts to all s3 queries
• 1b6e6388f8 Merge pull request #48588 from garethgreenaway/48415_event_send_multi_master
• fab25af1a9 Adding some quick documention about why we are setting ret=True following the channel.send.
• bf78f4b188 If the channel send is sucessful 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
• 779d1a3dcb only run pylint on files that change
• 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
• f69932f506 fix pylint
• 70e36764ee Add more tests for salt-ssh state.sls_id
• dab80e805c Fix state.sls_id to run on ssh minion and not master
• 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