Salt 2017.7.3 Release Notes¶
Version 2017.7.3 is a bugfix release for 2017.7.0.
Statistics¶
Total Merges: 501
Total Issue References: 94
Total PR References: 423
Contributors: 86 (3add3287, BenoitKnecht, Ch3LL, CorvinM, Da-Juan, DmitryKuzmenko, Giandom, The-Loeki, UtahDave, adelcast, amendlik, angeloudy, anlutro, arthurlogilab, basepi, benediktwerner, brejoc, cachedout, campbellmc, chnrxn, clan, corywright, damon-atkins, dincamihai, dmurphy18, eliasp, eradman, forksaber, frogunder, gaborn57, garethgreenaway, golmaal, gracinet, gtmanfred, haam3r, isbm, jettero, jf, jubrad, keesbos, kris-anderson, lomeroe, mateiw, mattLLVW, mephi42, mirceaulinic, mkurtak, morganwillcock, msummers42, mtorromeo, multani, mvivaldi, mz-bmcqueen, nasenbaer13, nicholasmhughes, oarmstrong, pkruk, pratik705, psagers, rallytime, rbjorklin, rcallphin, renner, rhoths, richardsimko, rklaren, roaldnefs, s0undt3ch, samodid, skizunov, skjaro, steverweber, sumeetisp, t0fik, techhat, terminalmage, timfreund, timka, tkwilliams, twangboy, unthought, vernondcole, vutny, wedge-jarrad, whytewolf, xuhcc)
Windows Changes¶
pkg Execution Module`¶
Significate changes (PR #43708 & #45390, damon-atkins) have been made to the pkg execution module. Users should test this release against their existing package sls definition files.
pkg.list_availableno longer defaults to refreshing the winrepo meta database.pkg.installwithout aversionparameter no longer upgrades software if the software is already installed. Usepkg.install version=latest(or simply use apkg.lateststate to get the old behavior.pkg.list_pkgsnow returns multiple versions if software installed more than once.pkg.list_pkgsnow returnsNot Foundwhen the version is not found instead of(value not set)which matches the contents of the sls definitions.pkg.removewill wait up to 3 seconds (normally about a second) to detect changes in the registry after removing software, improving reporting of version changes.pkg.removecan removelatestsoftware, iflatestis defined in sls definition.Documentation was update for the execution module to match the style in new versions, some corrections as well.
All install/remove commands are prefix with cmd.exe shell and cmdmod is called with a command line string instead of a list. Some sls files in saltstack/salt-winrepo-ng expected the commands to be prefixed with cmd.exe (i.e. the use of
&).Some execution module functions results, now behave more like their Unix/Linux versions.
cmd Execution Module¶
Due to a difference in how Python's subprocess.Popen() spawns processes on
Windows, passing the command as a list of arguments can result in problems.
This is because Windows' CreateProcess requires the command to be passed as a
single string. Therefore, subprocess will attempt to re-assemble the list
of arguments into as string. Some escaped characters and quotes can cause the
resulting string to be incorrectly-assembled, resulting in a failure to execute
the command.
Salt now deals with these cases by joining the list of arguments correctly and
ensuring that the command is passed to subprocess.Popen() as a string.
Changelog for v2017.7.2..v2017.7.3¶
Generated at: 2018-05-26 21:36:50 UTC
ISSUE #45743: (frogunder) Multi-master PKI not working on Py3 (refs: #45755)
PR #45755: (terminalmage) salt.crypt: Ensure message is encoded before signing @ 2018-01-29 19:04:50 UTC
1439da8d76 Merge pull request #45755 from terminalmage/issue45743
8af1251c59 salt.crypt: Ensure message is encoded before signing
PR #45700: (Ch3LL) Add PRs to 2017.7.3 Release Notes @ 2018-01-25 20:56:45 UTC
fe194d755f Merge pull request #45700 from Ch3LL/7.3_rn
84c8216901 Add PRs to 2017.7.3 Release Notes
PR #45681: (damon-atkins) 2017.7.3 Release notes for Windows @ 2018-01-25 15:13:18 UTC
ce41f6a6ee Merge pull request #45681 from damon-atkins/2017.7.3_win_release_notes
1d21f86228 Update 2017.7.3.rst
PR #45672: (rallytime) Back-port #45667 to 2017.7.3 @ 2018-01-25 14:04:54 UTC
PR #45669: (rallytime) Update man pages for 2017.7.3 release @ 2018-01-24 21:04:59 UTC
23ff1264e0 Merge pull request #45669 from rallytime/man-pages-2017.7.3
d31b41adeb Update man pages for 2017.7.3 release
PR #45666: (terminalmage) Fix failing pkg integration tests for releases with no '.' @ 2018-01-24 17:19:10 UTC
9a17405ba6 Merge pull request #45666 from terminalmage/salt-jenkins-793
4a6ab729dd Fix failing pkg integration tests for releases with no '.'
PR #45664: (rallytime) Back-port #45452 to 2017.7.3 @ 2018-01-24 15:33:13 UTC
PR #45649: (rallytime) Back-port #45634 to 2017.7.3 @ 2018-01-24 14:59:43 UTC
PR #45654: (twangboy) Merge forward #45638 @ 2018-01-24 14:59:14 UTC
PR #45653: (rallytime) Back-port #45611 to 2017.7.3 @ 2018-01-24 05:20:11 UTC
PR #45611: (terminalmage) Fix unnecessary/incorrect usage of six.binary_type (refs: #45653)
6fc293da46 Merge pull request #45653 from rallytime/bp-45611
0a6b06d8ea Fix unnecessary/incorrect usage of six.binary_type
PR #45642: (rallytime) Back-port #45636 to 2017.7.3 @ 2018-01-23 22:00:30 UTC
PR #45645: (rallytime) Back-port #45606 to 2017.7.3 @ 2018-01-23 21:54:45 UTC
PR #45606: (terminalmage) Fix bug affecting salt-ssh when root_dir differs from the default (refs: #45645)
f37a5b6d8d Merge pull request #45645 from rallytime/bp-45606
d52d96f30a Fix bug affecting salt-ssh when root_dir differs from the default
PR #45641: (rallytime) Back-port #45508 to 2017.7.3 @ 2018-01-23 21:18:39 UTC
PR #45604: (rallytime) Back-port #45582 to 2017.7.3 @ 2018-01-22 16:54:15 UTC
PR #45582: (terminalmage) Two salt-ssh fixes (refs: #45604)
ced3269ae8 Merge pull request #45604 from rallytime/bp-45582
bc8a450cc7 Remove state.py utils file from thin list
629e6c9674 Further fixes to for salt-ssh test under heavy load
0dff596b59 Add salt/utils/state.py to thin tarball
a61afda100 Pass on OSError if thin tarball already removed
PR #45591: (gtmanfred) mark minion_blackout tests as flaky @ 2018-01-22 00:14:31 UTC
4672baa6c8 Merge pull request #45591 from gtmanfred/2017.7.3
f7fd35fc4a test updating the minion blackout timeout to 10 seconds
PR #45585: (rallytime) Back-port #45579 to 2017.7.3 @ 2018-01-22 00:13:59 UTC
PR #45579: (terminalmage) Test suite stability fixes (refs: #45585)
2a992f9017 Merge pull request #45585 from rallytime/bp-45579
0292c8345b Lint fix: use six's map
108d8cbeef Use correct utils path for 2017.7
a38f4cb6d6 Restrict pyzmq optimizations to pyzmq >= 14.3.0
58ad558346 Fix event unpack
PR #45573: (gtmanfred) update 2017.7.3 tests @ 2018-01-20 20:05:13 UTC
19cd97ed3b Merge pull request #45573 from gtmanfred/2017.7.3
bd3cb47fa7 fix mock for opensuse
808e26e69a test simple website
PR #45570: (gtmanfred) Fix tests for 2017.7.3 @ 2018-01-20 15:01:21 UTC
e72d81ef22 Merge pull request #45570 from gtmanfred/2017.7.3
1f71f301ba specify checking man page path
2ddbcb45c1 fix pkg_resources for usage with testing pip
0ba39a7108 switch systemd-journald for sshd for arch service test
PR #45538: (gtmanfred) Backport test fixes to 2017.7.3 @ 2018-01-19 14:39:44 UTC
7bc60c56d4 Merge pull request #45538 from gtmanfred/2017.7.3
801e0639b6 Merge branch '2017.7.3' into 2017.7.3
PR #45533: (rallytime) Back-port #45529 to 2017.7.3 @ 2018-01-18 22:52:29 UTC
ISSUE #45394: (dmurphy18) git.latest fails when "depth" is used with a non-default branch (refs: #45399)
PR #45442: (rallytime) Back-port #45399 to 2017.7.3 @ 2018-01-17 17:20:48 UTC
PR #45399: (terminalmage) Fix git.latest failure when rev is not the default branch (refs: #45442)
7379f9e3e5 Merge pull request #45442 from rallytime/bp-45399
590a6db626 Lint: use support TMP path instead of integration TMP path
c081b2c62c Fix git.latest failure when rev is not the default branch
PR #45468: (twangboy) Fix some issues with reg.py @ 2018-01-16 22:23:47 UTC
ee5090f69b Merge pull request #45468 from twangboy/win_reg
a0d21c6354 Fix some issues with reg.py
ISSUE #44913: (ari) FreeBSD packaging install performance regression (refs: #45174)
PR #45434: (rallytime) Back-port #45174 to 2017.7.3 @ 2018-01-14 12:43:16 UTC
PR #45395: (rallytime) Back-port #45380 to 2017.7.3 @ 2018-01-12 18:49:20 UTC
ISSUE #44107: (anlutro) salt-ssh 2017.7 doesn't work with Python 3, missing backports_abc (refs: #45294)
PR #45294: (gtmanfred) include backports_abc @ 2018-01-11 18:18:16 UTC
f7da716d32 Merge pull request #45294 from gtmanfred/2017.7
3633ceeaa7 Merge branch '2017.7' into 2017.7
29806e4496 ignore salt.ext in pylint
8b597a4890 include backports_abc
ISSUE #43130: (boltronics) module.run documentation issues (refs: #45381)
PR #45381: (gtmanfred) fix module.run docs @ 2018-01-11 18:02:38 UTC
f77a3e9cd4 Merge pull request #45381 from gtmanfred/module.run
230e899192 fix module.run docs
ISSUE #43995: (dragonpaw) Using zmq built with --enable-draft breaks Salt (refs: #45368)
PR #45368: (DmitryKuzmenko) Fixes to work with pyzmq with --enable-drafts @ 2018-01-11 17:53:16 UTC
8efd29f4d9 Merge pull request #45368 from DSRCorporation/bugs/zmq_draft
7622e355cf Minor: removed a stale comment.
00f31bf9b5 Fixes to work with pyzmq with --enable-drafts
PR #45371: (rallytime) Back-port #45158 to 2017.7 @ 2018-01-11 17:51:38 UTC
PR #45158: (terminalmage) Fix integration.modules.test_state.StateModuleTest.test_exclude (refs: #45371)
22c3efda06 Merge pull request #45371 from rallytime/bp-45158
3565bc2bf2 Don't use include-test SLS in orch tests
8bc17e0d7a Fix integration.modules.test_state.StateModuleTest.test_exclude
PR #45387: (renner) Set SHELL environment variable @ 2018-01-11 16:23:21 UTC
PR #45388: (terminalmage) Fix loader error in 2017.7 tests @ 2018-01-11 16:13:53 UTC
dcf98a2260 Merge pull request #45388 from terminalmage/fix-test-loader-error
5473c085d9 Fix loader error in 2017.7 tests
PR #45382: (terminalmage) Skip flaky test on 2017.7 branch @ 2018-01-11 14:23:05 UTC
d15f9e1020 Merge pull request #45382 from terminalmage/salt-jenkins-686
ff3039db6c Skip flaky test on 2017.7 branch
PR #45369: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2018-01-10 22:14:05 UTC
dbe21b2c0d Merge pull request #45369 from rallytime/merge-2017.7
f65e091df8 Merge branch '2016.11' into '2017.7'
0959ae4ea3 Merge pull request #45327 from lomeroe/bp-44861_2016.11
784139f734 Check for values other than 0 or 1
a6db5f95f0 Merge pull request #45268 from damon-atkins/2016.11_win_pkg_pkg_install_latest
325a9f0f66 Update 2016.11.9.rst
4da9200b9c Update 2016.11.9.rst
126aee36ac Update 2016.11.9.rst
1c01967943 Update 2016.11.9.rst
a0d89882b8 Fix pkg.install packagename version=latest i.e. if on an old version upgrade to the latest
PR #45379: (rhoths) Minor spelling/grammar fixes in the highstate returner documentation @ 2018-01-10 20:09:52 UTC
55979b3a48 Merge pull request #45379 from rhoths/rhoths-doc-highstate-1
afbbd492cd Minor spelling/grammar fixes in highstate returner
PR #45358: (UtahDave) gate the minion data cache refresh events. @ 2018-01-10 17:21:05 UTC
PR #45299: (garethgreenaway) [2017.7] config gate auth_events (refs: #45358)
541e59fa75 Merge pull request #45358 from UtahDave/gate_data_cache_refresh
379b6cd23e should be self, not salt
a82e158f2d gate the minion data cache refresh events.
PR #45297: (Ch3LL) Allow macosx service state tests to check for pid return @ 2018-01-09 20:47:24 UTC
fb87010461 Merge pull request #45297 from Ch3LL/mac_service_state
4e569b5802 Allow macosx service state tests to check for pid return
PR #45351: (dmurphy18) Update debbuild to explicitly include source code for Debian, Ubuntu @ 2018-01-09 17:21:51 UTC
beedf6e815 Merge pull request #45351 from dmurphy18/upd_debbuild
478dc70092 Update debbuild flags
PR #45299: (garethgreenaway) [2017.7] config gate auth_events (refs: #45358) @ 2018-01-09 15:00:30 UTC
66da9b47bc Merge pull request #45299 from garethgreenaway/config_gate_auth_events
9a15ec3430 Updating versionadded string. Fixing typo.
edfc3dc078 Adding in documentation for auth_events configuration option
3ee4eabffd Fixing small typo
6a28bddcc9 Adding some code to config gate if auth_events are sent
PR #44856: (Ch3LL) Add state.running ssh integration test @ 2018-01-08 21:40:50 UTC
8d04c2b3d4 Merge pull request #44856 from Ch3LL/running_test
9a35a73711 add time limit to while loop
aeb5f4e248 Add state.running ssh integration test
ISSUE saltstack/salt-jenkins#675: (rallytime) [2017.7] unit.states.test_file.TestFileState.test_directory is failing on Fedora 27 and CentOS 6 (refs: #45295)
PR #45295: (gtmanfred) test directory that doesn't exist @ 2018-01-08 20:59:53 UTC
d0e5e70277 Merge pull request #45295 from gtmanfred/test_directory
e6178fe6d4 Merge branch '2017.7' into test_directory
24114e91c1 test was different slightly on 2017.7
d20fc93625 test directory that doesn't exist
ISSUE saltstack/salt-jenkins#678: (rallytime) [2017.7] Proxy Minion Tests for Py3 are failing (refs: #45302)
PR #45302: (gtmanfred) fix proxy tests for py3 on 2017.7 @ 2018-01-08 17:41:58 UTC
f49b204b75 Merge pull request #45302 from gtmanfred/proxyp3
b295ec0429 make dummy proxy module py3 compatible
8736e21f65 fix starting proxy minion on py3
e2824a7253 fix py3 tests
PR #45279: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2018-01-08 17:26:49 UTC
PR #44853: (gtmanfred) remove not from vault utils @ 2018-01-05 17:43:18 UTC
dab4a8cff3 Merge pull request #44853 from gtmanfred/vault
bfee1cead6 set role for loading minion config
c5af2e5048 if utils is not loaded, load it
6a5e0f9ac1 remove not from vault utils
PR #45277: (rallytime) Back-port #45025 to 2017.7 @ 2018-01-05 15:35:53 UTC
PR #45025: (steverweber) Fix pillar include merge order (refs: #45277)
f09d0e5fdb Merge pull request #45277 from rallytime/bp-45025
942c14bb29 pillar body overrides includes
1152202fdc fix pillar includes from merging over the current sls defines
PR #45276: (rallytime) Back-port #45260 to 2017.7 @ 2018-01-05 14:45:40 UTC
ISSUE #43340: (syphernl) Upgrading Salt via Salt results in dying minions and broken dpkg (refs: #45255)
PR #45255: (rallytime) Back-port #44427 to 2017.7 @ 2018-01-04 21:46:17 UTC
ISSUE #23454: (HontoNoRoger) SLS rendering error with Salt-SSH (pydsl) (refs: #45251)
PR #45251: (forksaber) Fix #23454 : make pydsl work with salt-ssh @ 2018-01-04 21:33:09 UTC
PR #45254: (Ch3LL) Add darwin value for ssh grain items tests on MacOSX @ 2018-01-04 21:31:35 UTC
2934b60d53 Merge pull request #45254 from Ch3LL/fix_mac_grain_ssh
b4b59b89cd remove platform from salt.utils call for 2017.7
85e853a63d Add darwin value for ssh grain items tests on MacOSX
PR #45135: (twangboy) Fix win_dacl problems with SIDs @ 2018-01-04 21:01:48 UTC
af2d880303 Merge pull request #45135 from twangboy/win_fix_dacl
b31e08946a Merge branch '2017.7' into win_fix_dacl
35a417f510 Fix win_dacl problems with SIDs
ISSUE #43806: (Ch3LL) Add spm man Test to Auto Test Suite (refs: #44930)
PR #44930: (frogunder) man_spm_test @ 2018-01-04 20:58:02 UTC
d0a3770035 Merge pull request #44930 from frogunder/man_spm
48e6953e1f fix_string_error
c9fa4ed2a7 man_spm_test
PR #45259: (Ch3LL) Fix MacOSX Service Status Check and integration test @ 2018-01-04 14:25:01 UTC
543eebf411 Merge pull request #45259 from Ch3LL/fix-mac-service-test
74e6ed60ea Fix MacOSX Service Status Check and integration test
PR #45263: (sumeetisp) Updating python version for 2017.7 @ 2018-01-04 14:16:26 UTC
bbbd1872a7 Merge pull request #45263 from sumeetisp/2017.7
e3a5ee3a08 Merge branch '2017.7' into 2017.7
71aea9a3bc Merge pull request #1 from sumeetisp/sumeetisp-python-version
1b4806e2b9 Updating python version
PR #45244: (twangboy) Fix search/replace in Py3 @ 2018-01-04 14:02:22 UTC
d46e1197be Merge pull request #45244 from twangboy/win_fix_portable.py
e3a8279c01 Get path to python binary based on executable
03aec37040 Fix search/replace in Py3
PR #45233: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2018-01-03 15:34:00 UTC
PR #45175: (amendlik) Pkg uptodate @ 2018-01-02 17:38:36 UTC
693cc807e8 Merge pull request #45175 from amendlik/pkg-uptodate
4f514a29a7 Merge branch '2017.7' into pkg-uptodate
PR #45226: (gtmanfred) Update kitchen to use runtests verifier on 2017.7 @ 2017-12-31 18:13:28 UTC
1b3f3ba1be Merge pull request #45226 from gtmanfred/2017.7
4f3b089e0e fix copying back
f56f062a6a download xml for junit
7cc342a5d6 use new runtests verifier
PR #45221: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-12-30 18:08:29 UTC
7d3a6cbc65 Merge pull request #45221 from rallytime/merge-2017.7
508599e159 Merge branch '2016.11' into '2017.7'
707ef55175 Merge pull request #45161 from lomeroe/bp-44944_2016.11
0a4c6b5a83 remove references to six.unichr
f3196d795d lint fixes for static regexes
11b637d108 lint fixes
c14d6282ad do not decode registry.pol file wholesale, but instead decode individual elements of the file
6f52034e08 Merge pull request #45199 from gtmanfred/status
fb07f9ea7d status.pid returns pid ids not process names
ISSUE #45176: (thuhak) osquery execution module does't work with attrs parameter (refs: #45204)
PR #45204: (garethgreenaway) [2017.7] Fixes to osquery module & addition of unit tests @ 2017-12-30 13:25:38 UTC
abed378981 Merge pull request #45204 from garethgreenaway/45176_fixes_to_osquery_module
dc933e9e24 Fixing typo
d834bd1b6f Fixing some minor lint issues.
4738205154 Fixing a bug when attributes are passed to various osquery module functions.
66884334d9 Update states.pkg for Python3 compatibility
2a7d76ad6e Fail pkg.uptodate if expected packages are not upgraded
29ef67bac2 Test pkg.uptodate with failed upgrades
23ab93353b Produce changes dict for pkg.uptodate dry-run mode
7c67ec39d9 Add tests for pkg.uptodate state
PR #45203: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-12-29 01:11:03 UTC
5991d8ca15 Merge pull request #45203 from rallytime/merge-2017.7
430c913c8c Merge branch '2016.11' into '2017.7'
d3381e27d0 Merge pull request #45118 from garethgreenaway/44728_nodegroups_seq
0ff811de70 Swapping import to be the old path for 2016.11
b3e2f388f5 Fix to allow nodegroups to include sequences
f969aca3a3 Merge pull request #45127 from twangboy/win_fix_pkg
14639739f2 Fix issue with 1641 return code
dc357b39f0 Merge pull request #45137 from twangboy/win_fix_reg_tests
b6f4ef8d73 Catch correct error type in list_keys and list_values
0aa1662731 Merge pull request #45130 from rallytime/api-groups
2dcc8df845 Resolve groups for salt api
7dc3cc4641 Merge pull request #45114 from twangboy/win_fix_pam
cf5eae1f77 Move pam library load to try/except block
PR #45201: (rallytime) [2017.7] Check for running on python3 before decoding bytes @ 2017-12-28 22:59:14 UTC
PR #45200: (rallytime) [2017.7] Fix docstring integration test failure @ 2017-12-28 22:58:34 UTC
PR #45186: (rallytime) Back-port #44922 to 2017.7 @ 2017-12-28 19:02:51 UTC
PR #44922: (dincamihai) Fix salt-master for old psutil (refs: #45186)
67d97303b5 Merge pull request #45186 from rallytime/bp-44922
6970fe8103 Fix salt-master for old psutil
PR #44624: (eliasp) Fix Traceback when using the service.enabled state on non-booted systems @ 2017-12-28 10:58:43 UTC
30d7f7257a Merge pull request #44624 from eliasp/fix-upstart-utmp-exception
43d44e051a Do not blindly assume presence of either /var/run/utmp or /run/utmp, none of both might be available (e.g. on non-booted systems).
PR #45183: (twangboy) Add libnacl dependency @ 2017-12-27 22:08:32 UTC
3832e7b227 Merge pull request #45183 from twangboy/win_add_libnacl_2017.7
b46845888d Add libnacl dependency
ISSUE #44928: (rcallphin) Duplicating master token when no match for Minion policy (Vault Module) (refs: #44966)
PR #44966: (rcallphin) Fix bug with vault runner creating token on empty policy @ 2017-12-22 20:30:37 UTC
fbbf33574e Merge pull request #44966 from rcallphin/fix-bug-vault-empty-policy
7f327ab760 Lint: Remove extra whitespace
04ab6a5e9d Merge branch '2017.7' into fix-bug-vault-empty-policy
5be463bb46 Merge branch '2017.7' into fix-bug-vault-empty-policy
48d9cc3674 Fix bug with vault runner creating token on empty policy
PR #44552: (Da-Juan) pip_state: Check if available upgrades fulfill version requirements. (refs: #45200) @ 2017-12-22 19:25:17 UTC
487207f61d Merge pull request #44552 from Da-Juan/avoid_unneeded_pip_install
49a6a8f02e Merge branch '2017.7' into avoid_unneeded_pip_install
3a8e62493d pip_state: Check if available upgrades fulfill version requirements
62252d74d9 pip_state: Compare versions using pkg_resources.parse_version
5219ab974c Add list_all_versions function to pip module
PR #45090: (angeloudy) fix TypeError in python 3 (refs: #45201) @ 2017-12-22 18:11:13 UTC
5ae26f0c09 Merge pull request #45090 from angeloudy/2017.7
cf411f8984 Merge branch '2017.7' into 2017.7
177fd18671 fix TypeError in python 3
ISSUE #44315: (whytewolf) cmd.* cwd does not escape spaces. 2017.7.2 (refs: #45134)
PR #45134: (garethgreenaway) [2017.7] fix to cmd.script for cwd with space @ 2017-12-22 15:31:24 UTC
a1946730a9 Merge pull request #45134 from garethgreenaway/44315_cmd_script_cwd_with_space
48eafe3206 Adding some tests to tests cmd.script with cwd
8dfcf71b08 Adding _cmd_quote to handle cases when the current working directory for cmd.script might have a space in it.
PR #44964: (Giandom) added-highstate-output-to-slack-engine @ 2017-12-21 21:32:01 UTC
f41adfc913 Merge pull request #44964 from Giandom/2017.7-added-highstate-output-to-slack-engine
4526c158f1 added-highstate-output-to-slack-engine
573a0a4143 added-highstate-output-to-slack-engine
9a6e03ce6e added-highstate-output-to-slack-engine
PR #45124: (gtmanfred) enable using kitchen-salt with ec2 on 2017.7 @ 2017-12-21 19:11:27 UTC
b49ee97938 Merge pull request #45124 from gtmanfred/2017.7
d0586013eb fix pylint
59e2e56d13 chmod the xml files before trying to copy
a5c1410e23 catch IOError when copying xml files back
23bd38ad66 enable using kitchen-salt on ec2
PR #45087: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-12-20 22:24:51 UTC
42e894570d Merge pull request #45087 from rallytime/merge-2017.7
fe81e2d39a Merge branch '2016.11' into '2017.7'
4f21a2bbfd Merge branch '2016.11' into '2017.7'
324b7d4058 Merge pull request #44078 from rossengeorgiev/fix-41044
a81a6fe23c fix #41044; allow for date param to be 0
48a59761df Merge pull request #44970 from rallytime/update-bootstrap-script
b2c8057427 Update bootstrap script to latest release: 2017.12.13
637fdaed58 Merge pull request #45069 from rallytime/bp-45040
aa438e1605 Installation Fails on headless machines.
4d6d640381 Merge pull request #44969 from rallytime/bp-41305
5c4bee43dc correct accept_vpc_peering_connection
10de468f13 Merge pull request #45031 from terminalmage/fix-mysql-returner
f3bd12c27c Fix invalid exception class in mysql returner
9a7406207f Merge pull request #44972 from terminalmage/bp-44958
a416bf0112 No need to manually do connect_pub, use listen=True in run_job
3ec004bd2e Fix a race condition in manage runner
1032ca3290 Merge pull request #44385 from gtmanfred/schedule
9e15c38da2 add comma
855d933cb7 schedule should be a dict
PR #45112: (Ch3LL) Fix spm big file build test to check /tmp @ 2017-12-20 22:09:21 UTC
9550e742ac Merge pull request #45112 from Ch3LL/fix-arch
1bd7110a14 Fix spm big file build test to check /tmp
ISSUE #44303: (mwerickso) boto3_route53 module times out on retries (refs: #44976)
PR #45068: (rallytime) Back-port #44976 to 2017.7 @ 2017-12-20 16:31:22 UTC
ISSUE #44961: (golmaal) The archive tar function fails to untar file when dest argument is passed (refs: #44983)
PR #45099: (rallytime) Back-port #44983 to 2017.7 @ 2017-12-20 14:41:22 UTC
ISSUE #43533: (Ch3LL) Add status.pid Test to Auto Test Suite (refs: #44650)
PR #44650: (frogunder) add status.pid test @ 2017-12-19 16:21:09 UTC
e0d7b330fa Merge pull request #44650 from frogunder/status
904c0da893 Merge branch '2017.7' into status
619bd2be1e fix lint error
d406cb07a3 add status.pid test
ISSUE #44516: (doesitblend) Windows PY3 Minion Returns UTF16 UnicodeError (refs: #45161, #44944)
PR #44944: (lomeroe) win_lgpo registry.pol encoding updates (refs: #45161) @ 2017-12-19 14:42:49 UTC
422d8b8f1b Merge pull request #44944 from lomeroe/update_regpol_encoding
07d04c7bc7 lint fixes for static regexes
d17c46ce41 lint fixes
ab8e431729 do not decode registry.pol file wholesale, but instead decode individual elements of the file
PR #44938: (The-Loeki) Libcloud dns fixes @ 2017-12-18 15:47:18 UTC
d9a4b9681e Merge pull request #44938 from The-Loeki/libcloud_dns_fixes
276e8828ae libcloud_dns: pylint fix
c994423286 Merge branch '2017.7' into libcloud_dns_fixes
PR #44951: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-12-16 13:16:24 UTC
5137be01ec Merge pull request #44951 from rallytime/merge-2017.7
a0d2dd2069 Lint fix
9db4179462 Merge branch '2016.11' into '2017.7'
68d901b12c Merge pull request #44770 from cruscio/2016.11
e2682bf441 Fix minion ping_interval documentation
d4ab55ec47 Merge pull request #44335 from gtmanfred/2016.11
3f1268d67f fix patching for python 2.6
1d0bd5bb32 Merge branch '2016.11' into 2016.11
f02b02032d Merge pull request #4 from terminalmage/pr-44335
b4eb1527a6 Add test for PR 44335
a30af3252e add docker-ce to docker subtype grains check
PR #44995: (twangboy) Fix unit.modules.test_file for Windows @ 2017-12-15 17:05:49 UTC
698b04779e Merge pull request #44995 from twangboy/win_fix_atomicfile
8316481944 Comment the salt import
fe34f0c877 Set owner properly on Windows
ISSUE #44934: (vernondcole) http.wait_for_successful_query does not pause for documented intervals (refs: #44968)
PR #44968: (gtmanfred) fix http wait for state @ 2017-12-14 20:06:01 UTC
2e1a57b9bc Merge pull request #44968 from gtmanfred/http
ca6936f6eb fix http wait for state
c72db283d5 libcloud_dns: Further fixes to state output, pylint fixes
e9bbc23b11 Merge branch '2017.7' into libcloud_dns_fixes
ISSUE #44811: (xuhcc) rbenv.installed fails when rbenv installed globally (refs: #44900)
PR #44900: (xuhcc) Fix TypeError during rbenv ruby installation when rbenv is not found @ 2017-12-14 17:37:14 UTC
c4f0894689 Merge pull request #44900 from xuhcc/rbenv-ret-fix
fdd8310c31 Merge branch '2017.7' into rbenv-ret-fix
bfd0972d25 Fix TypeError during rbenv ruby installation when rbenv is not found
PR #44974: (twangboy) Skip test_log_created on Windows @ 2017-12-14 13:59:25 UTC
f0c2cf3cec Merge pull request #44974 from twangboy/win_skip_test_parsers
40665d7b08 Skip test_log_created on Windows
ISSUE #44820: (msteed) Custom returner breaks manage runner (refs: #44958)
PR #44958: (terminalmage) Fix a race condition in manage runner (refs: #44972) @ 2017-12-13 15:20:36 UTC
dad2d723ca Merge pull request #44958 from terminalmage/issue44820
ef749abfc6 No need to manually do connect_pub, use listen=True in run_job
2ac70cfab5 Fix a race condition in manage runner
PR #44956: (terminalmage) Avoid traceback when bogus value in pidfile @ 2017-12-13 14:30:12 UTC
db58345abb Merge pull request #44956 from terminalmage/fix-get_pidfile
d66f3a98d7 Avoid traceback when bogus value in pidfile
ISSUE #44932: (knine) ACLs Not Completely Verified (refs: #44945)
PR #44945: (gtmanfred) Fix handling of effective acls @ 2017-12-12 21:49:34 UTC
e8e3b3c8ff Merge pull request #44945 from gtmanfred/2017.7
66bb755751 add test for effective acls
0ff52a93dd use last entry in acl
PR #44942: (rallytime) Update README with SaltConf18 info @ 2017-12-12 21:47:23 UTC
47dc7b7afb Merge pull request #44942 from rallytime/readme-saltconf-update
d1317c44e2 Update README with SaltConf18 info
ISSUE #44665: (mvivaldi) Documentation of salt renders jinja (refs: #44943, #44895)
PR #44943: (mvivaldi) Fix for the jinja documentation @ 2017-12-12 20:20:41 UTC
7572982419 Merge pull request #44943 from mvivaldi/filters-doc
d23ac4eabc Fix for the jinja documentation
ISSUE #43417: (damon-atkins) win_pkg: pkg.install and pkg.remove general issues (refs: #44832, #43708)
PR #44832: (damon-atkins) win_pkg: Merge full copy of 2016.11 with many fixes and improvements to 2017.7 @ 2017-12-12 18:30:06 UTC
465cacad83 Merge pull request #44832 from damon-atkins/2017.7_replace_with_newer_2016.11_win_pkg
a4f0b41ba2 Should be a smaller change set since recent update from 2016.11
695334b201 Merge branch '2017.7_replace_with_newer_2016.11_win_pkg' of github.com:damon-atkins/salt into 2017.7_replace_with_newer_2016.11_win_pkg
843e204582 Merge branch '2017.7' into 2017.7_replace_with_newer_2016.11_win_pkg
4b60b1ec84 Merge remote branch 'refs/remotes/upstream/2017.7' into 2017.7_replace_with_newer_2016.11_win_pkg
b46f818a57 Raise a PR to fix 2016 issues committed here, fixed issues with merge.
32ef1e12ae Merge branch '2017.7' into 2017.7_replace_with_newer_2016.11_win_pkg
494835c3f2 I backported develop and applied a long list of fixes to 2016.11 this brings these fixes into 2017.7 - Software was not always being removed, general if & was in the string or msi was downloaded to uninstall the software - pkg.list_upgrades failed. Added support for 'latest' and 'Not Found' for version_cmp() to fix this. - output fixes - pkg.list_available no longer forces a pkg.refresh_db this is no longer required, as by default it will update if older than 6 hours - cmd /s /c is prefixed for all commands i.e. installs and removes. - cmd are now strings, instead of a list when using cmd.run. As windows only supports strings. And the " were being broken
PR #44754: (twangboy) Fix inet_pton for Windows on Py3 @ 2017-12-12 14:04:20 UTC
a811a92b17 Merge pull request #44754 from twangboy/win_fix_inet_pton
25a20109fe Merge branch '2017.7' into win_fix_inet_pton
849b99eb34 Merge branch '2017.7' into win_fix_inet_pton
df1e6a202b Use salt.ext.six
5ac8112585 Use six to ensure unicode value
9b5d8c421b Handle unicode values
PR #44931: (pkruk) add missing parenthis to keep integration with python3 @ 2017-12-12 13:49:39 UTC
53b34e24cd Merge pull request #44931 from pkruk/fix-missing-parenthis
b1ed739b44 Merge branch '2017.7' into fix-missing-parenthis
4f1b1f12d2 Merge branch 'fix-missing-parenthis' of https://github.com/pkruk/salt into fix-missing-parenthis
3475d3fa01 add missing parenthis to keep integration with python3
adf38cacfb add missing parenthis to keep integration with python3
ad55e33f57 libcloud_dns: fix state output
a68d594e3a libcloud_dns: copy args before deleting from them
PR #44891: (twangboy) Fix issue with unsafe path in Windows jenkins tests @ 2017-12-11 21:10:43 UTC
ba6146250a Merge pull request #44891 from twangboy/win_fix_verify
7232579167 Allow test suite file_roots as a safe path
PR #44921: (Ch3LL) Add test to ensure log files are created @ 2017-12-11 18:24:16 UTC
85160fd297 Merge pull request #44921 from Ch3LL/log_test
3bb58fb577 skip salt-key log creation test
6a379195bc Add test to ensure log files are created
PR #44787: (rallytime) GroupAdd test: Add destructive test decorator to entire class @ 2017-12-11 18:14:18 UTC
54d29a61cb Merge pull request #44787 from rallytime/groupadd-destructive-clean
817ac002b0 Add destructive test decorator to test class
ISSUE #44665: (mvivaldi) Documentation of salt renders jinja (refs: #44943, #44895)
PR #44895: (mvivaldi) Jinja Filters doc @ 2017-12-11 15:32:07 UTC
0292e3612a Merge pull request #44895 from mvivaldi/filters-doc
62409d608a Added Escape Filters and Set Theory Filters in jinja documentation
PR #44879: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-12-10 16:53:44 UTC
PR #44855: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 (refs: #44879)
df28f312ac Merge pull request #44879 from rallytime/merge-2017.7
23c5a4ca3e Merge branch '2016.11' into '2017.7'
bb1f8dceaf Merge pull request #44579 from roaldnefs/fix-cron-identifier
df73a4c051 Merge branch '2016.11' into fix-cron-identifier
af0131fa1f Merge pull request #44852 from damon-atkins/2016.11_win_pkg_typo_n_fix
0e7c19084f Lint: Remove extra whitespace
7c7e21f94d Fix spelling typo, and fix backwards campatible minion option for repo location
88c0d66b4e Merge pull request #44794 from terminalmage/issue44365
3b8b6f25e6 Remove debugging line
153bf45b03 Fix regression in file.managed when source_hash used with local file
c8bb9dfbbb Merge pull request #44738 from rallytime/bump-oxygen-warnings
ead3c569e1 Bump deprecation warnings from Oxygen to Fluorine
88e3aab00d Merge pull request #44741 from gtmanfred/rhip
439dc8dce6 if gateway is not specified use iface
3ec4329307 Merge branch '2016.11' into fix-cron-identifier
99fa05a456 Fix for bug in cron state
97328faeac Fix for bug in cron module
PR #44880: (UtahDave) Determine windows hardware arch correctly @ 2017-12-08 22:24:09 UTC
8e14bc3941 Merge pull request #44880 from UtahDave/2017.7local
6e3c7ac1ac Merge branch '2017.7' into 2017.7local
PR #44861: (twangboy) Fix win_lgpo for unknown values (refs: #45327) @ 2017-12-08 18:52:05 UTC
dc51174670 Merge pull request #44861 from twangboy/win_fix_lgpo_invalid_value
89f65e19ff Check for values other than 0 or 1
PR #44621: (isbm) Bugfix: errors in external pillar causes crash, instead of report of them @ 2017-12-08 18:46:56 UTC
f5a143f8c5 Merge pull request #44621 from isbm/isbm-bsc1068446-2017.7
0d2675c4fe Use variable, instead of direct value
1ddc47da0a Add unit test for _get_pillar_errors when external pillar is clean and internal contains errors
68480d5dc9 Add unit test for _get_pillar_errors when both external and internal pillars contains errors
218a59e93b Add unit test for _get_pillar_errors when external pillar has errors and internal is clean
3ce19356c2 Add unit test for _get_pillar_errors when external and internal pillars are clean
67034139d9 Fix unit test: wrong error types in side effect
d9359bca13 Bugfix: unit test mistakenly expects pillar errors as a string, while it is a list
8c2bdc696b Bugfix: do not pull '_errors' from unchecked objects
d5e30999c7 Remove unused variable (no exception, within the try/finally block)
aad668d559 Fix and clarify docstring.
c2c47e4e71 Rename function from ambiguous name
265de8e61c Bugfix the logic according to the exact described purpose of the function.
dae9c6aa5c Determine windows hardware arch correctly
PR #43379: (twangboy) Fix file.managed on Windows with test=True @ 2017-12-07 21:10:43 UTC
abe089ad54 Merge pull request #43379 from twangboy/win_fix_file.managed
edcd581ca5 Merge branch '2017.7' into win_fix_file.managed
a27bb6993a Fix py3 error
0ff9fa498a Fix test_directory
187bc1e61e Add back the try/finally blocks
d7241d004f Fix 2 more tests
d5dd42aebe Fix integration tests for Windows
d56bc9aae9 Fix typo
af5565859e Use file functions for symlink and remove
72ac59c991 Fix some more integration tests for Linux
3f0499cbc4 Fix some integration tests
a24b964ea5 Fix unit test to handle new Exception
e3c3845f73 Raise CommandExecutionError when file doesn't exist
4602f499a2 Remove loader module mixin, add linux paths
99b27c037f Add tests to avoid future regression
5c215ed8c2 Fix documentation formatting
6a4e77e4b9 Return empty or unmodified dict on file not found
ISSUE #44565: (arthurlogilab) NameError: global name '__jid_event__' is not defined when running a runner in the scheduler (refs: #44570)
PR #44570: (gtmanfred) Include client mixin globals in scheduler for runner modules @ 2017-12-07 20:23:33 UTC
cf4cbcd340 Merge pull request #44570 from gtmanfred/2017.7
7b17f9f63c Merge branch '2017.7' into 2017.7
PR #44494: (skizunov) Fix broken beacons_before_connect feature @ 2017-12-07 18:24:49 UTC
ISSUE #44298: (skjaro) ipset state check problem (refs: #44356)
ISSUE #39552: (Xiami2012) ipset.check new implementation by @lingonl has countless critical bugs (refs: #44356)
PR #44512: (rallytime) Back-port #44356 to 2017.7 @ 2017-12-07 14:44:50 UTC
PR #44356: (skjaro) Fix ipset state with multiple entries and subtypes separated with comma (refs: #44512)
284a817565 Merge pull request #44512 from rallytime/bp-44356
6f92c71834 Merge branch '2017.7' into bp-44356
9a325146df Fix lint violation
5aac729855 Fix check multiple entries with subtypes separated with comma
PR #44748: (twangboy) Fix auto login support for OSX @ 2017-12-07 14:22:23 UTC
74ee7ce541 Merge pull request #44748 from twangboy/osx_fix_auto_login
068e463870 Fix lint, add integration tests
3df886df75 Fix lint, add gtmanfreds change
16cb24614f Add kcpassword functionality
PR #44842: (twangboy) Win fix lgpo unicode on Py3 issue @ 2017-12-07 14:21:14 UTC
b60cca174c Merge pull request #44842 from twangboy/win_fix_lgpo
efe77999d1 Gate log.debug statement behind successful pop
1c0ec79cd1 Fix py3 issue
PR #44843: (twangboy) Fix 2 typos in lgpo module @ 2017-12-06 17:56:44 UTC
bb58e2fec0 Merge pull request #44843 from twangboy/win_fix_lgpo_typo
c8f93e6dd7 Fix 2 types, shorten line lengths for spellchecking
PR #44827: (mz-bmcqueen) add more clone options to virtualbox and add better dhcp handling @ 2017-12-06 15:02:23 UTC
d6c37ea19c Merge pull request #44827 from mz-bmcqueen/2017.7
4ead3014b7 Merge branch '2017.7' into 2017.7
b7ce154014 Merge branch '2017.7' of https://github.com/mz-bmcqueen/salt into 2017.7
2f80f431b3 Merge branch '2017.7' into 2017.7
c2018c9021 fix pylint complaints
c38ff74261 add more clone options to virtualbox and add better dhcp handling
PR #44824: (Ch3LL) Add spm -y and -f arg integration tests @ 2017-12-05 21:49:32 UTC
019169ed61 Merge pull request #44824 from Ch3LL/spm_args
d8f81d2e4d fix pylint
61ac5cf157 Add spm -y and -f arg integration tests
PR #44742: (Ch3LL) Add salt-cloud action rename integration test @ 2017-12-05 17:44:50 UTC
59b930668c Merge pull request #44742 from Ch3LL/cloud_action_test
951d09ca2f remove unnecessary try/except block
c329ced7ee Add salt-cloud action rename integration test
ISSUE #42676: (mind-code) Changes in Pillar defined Beacons only apply after Minion restart (refs: #44771)
PR #44771: (garethgreenaway) [2017.7] Back porting #44071 @ 2017-12-05 17:16:06 UTC
PR #44071: (garethgreenaway) [develop] Various fixes to beacons (refs: #44771)
10442d9211 Merge pull request #44771 from garethgreenaway/42676_backport_44071
ec2a8b2032 Merge branch '2017.7' into 42676_backport_44071
180971203e Updating minion to respond to list_available events for beacons
db6fcefe62 Adding list_available which is used by the add function to verify that a becaon exists.
e9e0318bc6 Backporting fixes related to having beacons in pillar from #44071
PR #44784: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-12-05 17:13:49 UTC
PR #44732: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 (refs: #44784)
23d151b40a Merge pull request #44784 from rallytime/merge-2017.7-1
3d9eafc4bd Lint: Remove extra empty lines at end of files
239f3511bf Merge branch '2016.11' into '2017.7'
97e0cf569c Merge pull request #44699 from jfindlay/attr_file
9e5a40ea7c Merge branch '2016.11' into attr_file
5c34607f6c utils/files remove temp file upon move failure
7434e0afdf Merge pull request #44714 from rallytime/fix-44556
1bbe1abeb2 Allow --static option to display state runs with highstate output
998d714ee7 Merge pull request #44517 from whytewolf/publish_port_doc_missing
4b5855283a missed one place where i didn't chanbge master_port from my copy to publish_port
e4610baea5 update doc to have publish port
6169b52749 Merge pull request #41279 from Ch3LL/add_grain_tests
1b64f15692 Merge branch '2016.11' into add_grain_tests
dc6de050a9 Merge pull request #44563 from creideiki/pgjsonb-timestamps-44544
231e412ca4 Merge branch '2016.11' into pgjsonb-timestamps-44544
4369df020b Merge pull request #44602 from rallytime/fix-44601
ff303fd060 Handle timeout_monitor/TimeoutError issues for new versions of CherryPy
4a4756fc37 Merge pull request #44604 from lorengordon/doc-exclude
c4a6c40eb3 Documents the exclude argument in state execution module
15c445e6b9 Send Unix timestamps to database in pgjsonb
095f1b7d7a Merge branch '2016.11' into add_grain_tests
91d46d4cfc Merge pull request #44434 from whytewolf/1837
d148e39dda change from md to rst for code reference
955e305bda fix bad english, as requested by cachedout
7256fcc1c9 update note to take into account grains_cache
7a2981585e Merge branch '2016.11' into 1837
aca0405b26 add a note that describes grain rebuilding on restart and refresh
9ea4db4224 mock socket.getaddrinfo
78a07e30f4 add more fqdn tests and remove some of the mocking
5dbf4144ce add ipv6 in opts
eabc1b4f9c Add fqdn and dns core grain tests
a3bd99317f Merge pull request #44321 from gvengel/fix-file-line-diff-output
69a50204a6 Add newline for lint.
ef7b6bbb81 Fixed issue with file.line on Windows running Python 2.
8f89c99fa5 Fix FileModuleTest setUp and tearDown to work on Windows.
3ac5391f5f Namespace missing functions for file.line on Windows.
b2b8f075b9 Fixed test to work on Windows.
5a5a2dd026 Added integration test for issue #41474
24d7315f1a Fix file.line diff formatting.
9ca563718d Merge pull request #43708 from damon-atkins/2016.11_43417_Backport_and_Fixes
04d03ea6b8 Updated comment
1dd565e585 Merge remote branch 'upstream/2016.11' into 2016.11_43417_Backport_and_Fixes
dd48ba2616 Merge remote branch 'upstream/2016.11' into 2016.11_43417_Backport_and_Fixes
a0d08598bf dco fix
9467899fc6 Merge remote branch 'upstream/2016.11' into 2016.11_43417_Backport_and_Fixes
6dc180fd0e doco fixes
2496a42ea4 lint fix
2c937fbe19 Merge remote branch 'upstream/2016.11' into 2016.11_43417_Backport_and_Fixes
c9c8c48a4d all remove/install commands are passed to cmd.exe /s /c and commands are passed as strings to cmdmod
350244bd93 typo in comments and doc strings.
ec31f5a9bd 2017.11/develop version() was ignoring saltenv setting.
b314549a32 Backport of devlop to 2016.11 with additional bug fixes
68ea22188e Merge pull request #44477 from rallytime/bp-44424
4a9f8dcc96 Fix #44423: Handle index=None and index=0 distinctly
2c89050a24 Merge pull request #44483 from terminalmage/issue44034
a9db8becea salt-call: account for instances where __pillar__ is empty
b5c2028680 Merge pull request #44489 from whytewolf/1956_log-granular-levels
9cdeb4e903 update log-granular-levels to describe what they are filtering on
ea07f9c54c Merge pull request #44193 from twangboy/win_fix_reg
44d6d9f46d Remove unused import (lint)
f7502436bd Fix various issues
221e6e3b91 make salt.utils.to_unicode return none when passed none
ce41acc788 Fix many issues with reg.py
4a19df1f7f Use six.text_type instead of str
1b12acd303 Check type before casting
03fa37b445 Cast vdata to its proper type
ed8da2450b Merge pull request #43863 from nicholasmhughes/fix-atomicfile-permission-copy
ea852ec5d3 remove index use with stat module attributes
dbeeb0e917 fixes #38452 atomicfile only copies mode and not user/group perms
PR #44788: (kris-anderson) Example yaml of influxdb_user state @ 2017-12-04 14:28:45 UTC
4643a112e7 Merge pull request #44788 from kris-anderson/example-yaml-of-influxdb-user-state
afd23d058c converted yaml example to use 2 spaces
29e410c1ea added a code-block example of how the yaml should be formatted
ISSUE #42713: (boltronics) 2017.7.0 master upgrade breaks mine data on non-glob matching on minions (refs: #44735)
PR #44735: (gracinet) Backported issue #42713 to 2017.7 @ 2017-12-04 01:43:23 UTC
PR #44766: (twangboy) Fix unit.utils.test_process for Windows @ 2017-12-02 13:15:53 UTC
06ce7b7328 Merge pull request #44766 from twangboy/win_fix_test_process
a5737e8fc3 Fix lint errors
be96de09cc Fix pickling error by decorating
ISSUE #44083: (ari) timezone.system fails when /etc/localtime is missing on FreeBSD (refs: #44605)
PR #44716: (rallytime) Back-port #44605 to 2017.7 @ 2017-12-01 23:12:24 UTC
PR #44605: (campbellmc) Add handling for FreeBSD in timezone.zone_compare (refs: #44716)
f8b8a8966d Merge pull request #44716 from rallytime/bp-44605
9d43221422 Correct indentation
d6e28ebed1 Add handling for FreeBSD in method zone_compare to avoid exception when /etc/localtime file does is absent. This is valid configuration on FreeBSD and represents UTC.
ISSUE #41869: (mirceaulinic) Thorium: unable to execute runners (refs: #44781)
PR #44781: (mirceaulinic) Correct the thorium runner @ 2017-12-01 22:55:52 UTC
8ed6287762 Merge pull request #44781 from cloudflare/thorium-fix-41869
83c73a69cb Instance the Runner class instead of the RunnerClient as we're running on the Master
b72b7c5402 Correct the thorium runner
PR #44466: (twangboy) Fix unit.modules.test_disk for Windows @ 2017-12-01 22:31:42 UTC
52596be102 Merge pull request #44466 from twangboy/win_fix_test_disk
5615862f23 Fix some lint
627d5ab0c9 Mock salt.utils.which
e5a96fe00f Skip test_fstype on Windows
ISSUE #42763: (xuhcc) acme.cert state falsely reports about renewed certificate (refs: #44667)
PR #44719: (rallytime) Back-port #44667 to 2017.7 @ 2017-12-01 15:20:49 UTC
PR #44667: (oarmstrong) Fix acme.cert to run certbot non-interactively (refs: #44719)
b9ad4bba2d Merge pull request #44719 from rallytime/bp-44667
3d85a260c4 Fix acme.cert to run certbot non-interactively
ISSUE #44744: (brmzkw) roster_defaults breaks salt-ssh globbing (refs: #44747)
PR #44747: (gtmanfred) use a copy so roster_defaults doesn't mangle @ 2017-12-01 15:13:48 UTC
d23192c492 Merge pull request #44747 from gtmanfred/roster_defaults
911411ed8f add unit test
eefcfc719c use a copy so roster_defaults doesn't mangle
ISSUE #44694: (thuhak) state module at.absent does't work (refs: #44717)
PR #44717: (garethgreenaway) [2017.7] Fixes to at module @ 2017-12-01 14:37:05 UTC
20f20ad9e1 Merge pull request #44717 from garethgreenaway/44694_at_absent_failing_to_find_jobs
1f2b3c5f46 Merge branch '2017.7' into 44694_at_absent_failing_to_find_jobs
3bb385b44e removing debugging logging
7f0ff5a8b0 When passing IDs on the command line convert them all the strings for later comparison.
99e436add4 When looking for job ids to remove based on the tag_name the comparison was comparing an INT to a STR, so the correct job id was not being returned.
ISSUE #44136: (dupsatou) KeyError: 'runas' after updating to latest salt in yum repo. (refs: #44695)
PR #44695: (gtmanfred) pop None for runas and runas_password @ 2017-12-01 14:35:01 UTC
6e61aa787f Merge pull request #44695 from gtmanfred/pop
0efb90b6f7 Merge branch '2017.7' into pop
PR #44725: (whytewolf) document note suggesting systemd-run --scope with cmd.run_bg @ 2017-11-30 19:18:06 UTC
20391c54c0 Merge pull request #44725 from whytewolf/1919_cmd.run_no_daemons
4b11f8d66d add quick documentation suggesting systemd-run --scope if using cmd.run_bg with systemd
ISSUE #42300: (mirceaulinic) Grains state doesn't work (fine) with proxy minions (refs: #44760)
ISSUE #42074: (mirceaulinic) How to configure static grains for proxy minions (refs: #44549)
PR #44760: (mirceaulinic) Fix the grains.setvals execution function when working with proxy minions @ 2017-11-30 18:27:02 UTC
PR #44549: (mirceaulinic) Allow proxy minions to load static grains (refs: #44760)
85451ae977 Merge pull request #44760 from cloudflare/px-grains-set-42300
655139d01c Different path to the static grains file when running under a proxy minion
3eec8dbc63 Dummy proxy: catch EOFError instead of IOError
ISSUE #44583: (creideiki) Using splay in cron schedule throws exception "unsupported operand type(s) for +: 'NoneType' and 'int'" (refs: #44640)
PR #44640: (vutny) Fix #44583: splay with cron-like scheduled jobs @ 2017-11-30 15:30:41 UTC
PR #44712: (Ch3LL) Add pillar ssh integration tests @ 2017-11-30 15:29:33 UTC
e5a1401b82 Merge pull request #44712 from Ch3LL/ssh_pillar_items
97ec0e6ea0 Merge branch '2017.7' into ssh_pillar_items
c7f5af1274 Add pillar ssh integration tests
PR #44763: (mirceaulinic) Just a small improvement to the Thorium documentation @ 2017-11-30 14:38:03 UTC
2e1c946990 Merge pull request #44763 from cloudflare/thorium-doc
f8d69dd0ba Add thorium_roots configuration example
4610fb4e62 thorium_roots not thorium_roots_dir
PR #44531: (mirceaulinic) Add deprecation notes for the NAPALM native templates @ 2017-11-30 14:18:56 UTC
8ba2df1ea0 Merge pull request #44531 from cloudflare/deprecate-napalm-tpl
b462776d8b Add deprecation notes for the NAPALM native templates
PR #44737: (twangboy) Skip unit.transport.test_ipc for Windows @ 2017-11-29 19:18:21 UTC
7bde48282e Merge pull request #44737 from twangboy/win_skip_test_ipc
4e0359b603 Skip IPC transport tests in Windows, not supported
PR #44629: (Ch3LL) Add masterless state.highstate integration test @ 2017-11-29 19:05:23 UTC
c5206113ce Merge pull request #44629 from Ch3LL/high_masterless
9b7421b261 Change check to the state id
9cc853e3d5 Add masterless state.highstate integration test
PR #44613: (Ch3LL) Add pillar.items test for masterless @ 2017-11-29 14:43:11 UTC
2dc3e5c42a Merge pull request #44613 from Ch3LL/pillar_masterless
2c2e1e2332 Merge branch '2017.7' into pillar_masterless
69134e83ca Change order of local kwarg in run_call method
b3b5ecc6ff Add pillar.items test for masterless
PR #44659: (Ch3LL) Add state.sls_id to ssh wrapper and tests @ 2017-11-29 14:41:47 UTC
cc05481026 Merge pull request #44659 from Ch3LL/ssh_sls_id
04b5a3dd4e Add state.sls_id to ssh wrapper and tests
PR #44698: (Ch3LL) Add salt-ssh mine.get integration test @ 2017-11-28 22:15:29 UTC
642eed11e1 Merge pull request #44698 from Ch3LL/mine_ssh
f6a72acfe3 Merge branch '2017.7' into mine_ssh
9e67babf85 Add teardown to remove ssh dir
f90b4f7653 Add salt-ssh mine.get integration test
PR #44697: (Ch3LL) Sort the show_top results for test_state_show_top test @ 2017-11-28 20:35:41 UTC
5d82df5667 Merge pull request #44697 from Ch3LL/show_top_test
974db59dc1 convert the assert to a union set instead
add43c4cfe Sort the show_top results for test_state_show_top test
PR #44608: (Ch3LL) Add jinja to ssh sls test file @ 2017-11-27 22:00:28 UTC
f2f6817e86 Merge pull request #44608 from Ch3LL/ssh_jinja
df669b551d Merge branch '2017.7' into ssh_jinja
ca97517795 Add jinja to ssh sls test file
ISSUE #33957: (ghost) grains.setval doesn't setval if set in /etc/salt/minion (refs: #44663)
PR #44663: (whytewolf) Update notes around grains topic, and salt.modules.grains and salt.state.grains @ 2017-11-27 21:33:38 UTC
04b97bcfad Merge pull request #44663 from whytewolf/ZD1777_ensure_understanding_of_minion_config_over_grains_file
c9122e4b85 fixed pylint error, and updated description on at the top the the module and state.
7fb208b5ad Update note in topics/grains to reflect that not all grains are ignored. only those set in the minion config
PR #44332: (mirceaulinic) Improve the net.load_config execution function @ 2017-11-27 21:22:18 UTC
364deee6ac Merge pull request #44332 from cloudflare/improve-net-load
cd0bac87e6 Merge branch '2017.7' into improve-net-load
6d861f9a74 Disable pylint warning
3a0945ce3d Merge pull request #11 from tonybaloney/gh_44332_clone
88ef9f18fc ignore lint error on import
25427d845e convert key iterator to list as python 3 won't index an iterator
bce50154e5 Merge branch '2017.7' into improve-net-load
ba4a62769c Fix trailing spaces
0a47a7acbf Merge pull request #10 from tonybaloney/gh_44332_clone
ba0280e727 linting updates
78b90f3d0c add remaining tests
386c4e5791 add tests for all the getters
f3d2d1aaaa Merge pull request #9 from tonybaloney/gh_44332_clone
c63222358b update tests with correct assertions and mock methods on device instance
b69c559c52 fix kwargs typo
edea76d3f3 Improve the net.load_config function
PR #44664: (mvivaldi) Patch 1 @ 2017-11-27 21:17:20 UTC
b6a1ed06b8 Merge pull request #44664 from mvivaldi/patch-1
4551999ec7 Update jinja.py
ae13d57307 Update file.py
ISSUE #42074: (mirceaulinic) How to configure static grains for proxy minions (refs: #44549)
PR #44549: (mirceaulinic) Allow proxy minions to load static grains (refs: #44760) @ 2017-11-27 20:57:09 UTC
9ea4ee1479 Merge pull request #44549 from cloudflare/fix-proxy-grains
7b03574ab6 Merge branch '2017.7' into fix-proxy-grains
0320174ea4 Add doc note regarding static grains on proxy minions
509d1af832 Allow proxy minions to load static grains
PR #44572: (Ch3LL) Add watch_in integration test @ 2017-11-27 20:52:31 UTC
5ec7ea0bb5 Merge pull request #44572 from Ch3LL/watchin_test
0a54584ddb Merge branch '2017.7' into watchin_test
898c28e6d9 Merge branch '2017.7' into watchin_test
3df70f3fed remove iter for watch_in failure test
ac437ddf90 add order check and remove iter
5f2b4f434e Add watch_in integration test
c6733ac1ee pop None
PR #44616: (Ch3LL) Add Non Base Environment salt:// source integration test @ 2017-11-22 16:13:54 UTC
d6ccf4bb30 Merge pull request #44616 from Ch3LL/nonbase_test
80b71652e3 Merge branch '2017.7' into nonbase_test
c9ba33432e Add Non Base Environment salt:// source integration test
PR #44617: (Ch3LL) Add ssh thin_dir integration test @ 2017-11-22 16:12:51 UTC
3ace504c8c Merge pull request #44617 from Ch3LL/thindir_ssh
071a1bd65b Merge branch '2017.7' into thindir_ssh
PR #44625: (Ch3LL) Add salt-key -d integration test @ 2017-11-22 03:15:23 UTC
2cd618f99b Merge pull request #44625 from Ch3LL/delete_key_test
443dc1e16b Merge branch '2017.7' into delete_key_test
ISSUE #44601: (rallytime) CherryPy 12.0 removed support for "engine.timeout_monitor.on" config option (refs: #44602)
PR #44614: (rallytime) [2017.7] Move PR #44602 forward to 2017.7 @ 2017-11-21 21:21:06 UTC
PR #44602: (rallytime) Handle timeout_monitor attribute error for new versions of CherryPy (refs: #44614)
4f30e845ee Merge pull request #44614 from rallytime/44602-2017.7
628f015c1b Move TimoutError check lower down in exception list
d26d9ff5e4 Handle timeout_monitor/TimeoutError issues for new versions of CherryPy
359a59dd64 Add salt-key -d integration test
74ededafa7 Add ssh thin_dir integration test
4d0806e28c Merge branch '2017.7' into develop2
4d0d023115 Fix broken beacons_before_connect feature
98536110d9 Merge branch '2017.7' into 2017.7
PR #44571: (rallytime) Back-port #43822 to 2017.7 @ 2017-11-20 19:01:26 UTC
PR #44588: (rallytime) Add documentation about logging before modules are loaded @ 2017-11-20 18:43:18 UTC
PR #44576: (rallytime) Remove logging from top of napalm util file (refs: #44588)
PR #44439: (mirceaulinic) Adapt napalm modules to the new library structure (refs: #44576)
bea7f65291 Merge pull request #44588 from rallytime/logging-in-virtual-funcs
90d1cb221d Add documentation about logging before modules are loaded
PR #44513: (rallytime) Back-port #44472 to 2017.7 @ 2017-11-20 16:09:02 UTC
PR #44596: (roaldnefs) Fixed Mattermost module documentation @ 2017-11-19 23:30:53 UTC
f55b9daa63 Merge pull request #44596 from roaldnefs/fix-mattermost-doc
549f4806ce Fixed documentation in Mattermost module
PR #44528: (tkwilliams) INFRA-5978 - fix for https://github.com/saltstack/salt/issues/44290 @ 2017-11-17 17:35:44 UTC
f84a2b5ab1 Merge pull request #44528 from bodhi-space/infra5978
ba1d57f5eb Merge branch '2017.7' into infra5978
021692b6c9 INFRA-5978 - pylint / whitespace fix
c2210aaf7c INFRA-5978 - fix for https://github.com/saltstack/salt/issues/44290
PR #44537: (Ch3LL) Add multiple salt-ssh state integration tests @ 2017-11-17 17:17:48 UTC
7f2dd0382c Merge pull request #44537 from Ch3LL/ssh_highlow
b98df6de24 Add known_hosts_file to salt-ssh opts_pkg in wfuncs
913eedc699 Add multiple salt-ssh state integration tests
PR #44576: (rallytime) Remove logging from top of napalm util file (refs: #44588) @ 2017-11-17 14:55:13 UTC
PR #44439: (mirceaulinic) Adapt napalm modules to the new library structure (refs: #44576)
1975fb41bc Merge pull request #44576 from rallytime/remove-napalm-logging
eb91af999e Remove logging from top of napalm util file
PR #44575: (Ch3LL) Add service.running integration state test @ 2017-11-16 22:27:57 UTC
c2c3048f46 Merge pull request #44575 from Ch3LL/ser_run_test
7536150567 Add service.running integration state test
PR #44518: (twangboy) Pass root_dir to the win_verify_env function @ 2017-11-16 20:57:49 UTC
24b1d7af31 Merge pull request #44518 from twangboy/win_fix_verify_env
47114fdb30 Pass root_dirs to the win_verify_env function
3385f7faf3 fix pylint
a2af3cb857 Include client mixin globals in scheduler for runner modules
PR #44551: (mirceaulinic) Removes proxy minions false alarms and security risks @ 2017-11-16 15:09:14 UTC
1643bb7fd4 Merge pull request #44551 from cloudflare/annoying-tmpnam
ce1882943d Use salt.utils.files.mkstemp() instead
6689bd3b2d Don't use dangerous os.tmpnam
2d6176b0bc Fx2 proxy minion: clean return, like all the other modules
ISSUE #30454: (favoretti) Using yaml serializer inside jinja template results in unicode being prepended by '!!python/unicode' (refs: #30481, #42064, #38554)
PR #44541: (terminalmage) Fix test to reflect changes in YAML dumper @ 2017-11-15 13:23:58 UTC
PR #42064: (The-Loeki) utils.jinja: use utils.yamldumper for safe yaml dumping (refs: #44541)
PR #38554: (multani) Fix YAML deserialization of unicode (refs: #42064)
PR #30481: (basepi) Add yaml_safe jinja filter (refs: #38554)
60083ac27b Merge pull request #44541 from terminalmage/fix-yaml-test
5b8f54084b Merge branch '2017.7' into fix-yaml-test
PR #44538: (gtmanfred) Fix up some test kitchen stuff @ 2017-11-14 20:36:56 UTC
5c123eb551 Merge pull request #44538 from gtmanfred/kitchen
3e04d2d44c use kitchen-sync for copying files
9bc70fd31b back up to 2017.7.1 for kitchen tests
3b93ea058b ubuntu 14 and centos 6 should not have py3 tests
958e1aeb8d Fix test to reflect changes in YAML dumper
ISSUE #30454: (favoretti) Using yaml serializer inside jinja template results in unicode being prepended by '!!python/unicode' (refs: #30481, #42064, #38554)
PR #42064: (The-Loeki) utils.jinja: use utils.yamldumper for safe yaml dumping (refs: #44541) @ 2017-11-13 19:45:14 UTC
PR #38554: (multani) Fix YAML deserialization of unicode (refs: #42064)
PR #30481: (basepi) Add yaml_safe jinja filter (refs: #38554)
27a7b607b1 Merge pull request #42064 from The-Loeki/jinja_unicode
b1cf43c02d Merge branch '2017.7' into jinja_unicode
8c2ac58523 Merge branch '2017.7' into jinja_unicode
57dc6226a2 Merge branch '2017.7' into jinja_unicode
0a8346b585 Merge branch '2017.7' into jinja_unicode
393fe061b2 jinja utils: yaml import still necessary
3c9130f9f0 utils.jinja: use utils.yamldumper for safe yaml dumping
PR #43692: (mirceaulinic) Addressing a bug in the network find runner @ 2017-11-13 19:42:24 UTC
b1f14c7518 Merge pull request #43692 from cloudflare/fix-net-runner
02ffb4f38e Merge branch '2017.7' into fix-net-runner
4b2f791bd2 Check if addr is short IPv6
765504c137 Add all the possible keys to the result
ISSUE #42393: (The-Loeki) pillarenv ignored with Salt Master pillar_cache: True (refs: #43689)
ISSUE #36153: (krcroft) Pillarenv doesn't allow using separate pillar environments (refs: #43689)
PR #43689: (The-Loeki) make cached pillars use pillarenv rather than saltenv @ 2017-11-13 19:30:00 UTC
1e94a5bd5f Merge pull request #43689 from The-Loeki/cached_pilarenv
395c0c424d Merge branch '2017.7' into cached_pilarenv
60e001733b make cached pillars use pillarenv rather than saltenv
PR #43837: (twangboy) Fix unit.states.test_archive for Windows @ 2017-11-13 19:12:19 UTC
f9b273a894 Merge pull request #43837 from twangboy/win_unit_test_archive
5505a8819a Merge branch '2017.7' into win_unit_test_archive
b1dfe9c3c8 Format patching with statements for easier reading
ba2f2eb788 Add Erik's changes
4ef1e3eb97 Fix unit.states.test_archive for Windows
PR #44507: (Ch3LL) Increase sleep timeout for pillar refresh test @ 2017-11-13 18:29:06 UTC
caa81728a0 Merge pull request #44507 from Ch3LL/pillar_time
ffa4bddcad Increase sleep timeout for pillar refresh test
PR #44302: (morganwillcock) Fix traceback and incorrect message when resolving an unresolvable SID @ 2017-11-13 18:19:01 UTC
cffea5ac71 Merge pull request #44302 from morganwillcock/badsid
f3af106e33 Merge branch 'badsid' of https://github.com/morganwillcock/salt into badsid
95733fbb3b Merge branch '2017.7' into badsid
facc2cd16e Merge branch '2017.7' into badsid
c7cf5f6f70 Format pywintypes.error
9572aabb67 Fix traceback and incorrect message when resolving an unresolvable SID
PR #44439: (mirceaulinic) Adapt napalm modules to the new library structure (refs: #44576) @ 2017-11-13 17:43:24 UTC
32fc952000 Merge pull request #44439 from cloudflare/fix-napalm
f45378af04 Lint: remove extra spaces
c6a38258a3 Add napalm>2.0.0 note and update URLs
52f73835b8 Adapt napalm modules to the new library structure
PR #44457: (twangboy) Remove wmi monkeypatching @ 2017-11-13 17:38:52 UTC
ebbe5949ea Merge pull request #44457 from twangboy/win_remove_wmi_monkeypatching
6c872e95e6 Add back the setup_loader_modules function
20273e3697 No need for setup_loader_modules since we're actually importing wmi
8c107873cd Remove wmi monkeypatching
PR #44490: (Ch3LL) Enable test_deploy ssh test @ 2017-11-13 17:12:48 UTC
1da1a97d7d Merge pull request #44490 from Ch3LL/ssh_ping
e952cd6712 Enable test_deploy ssh test
PR #44491: (Ch3LL) Add salt-ssh raw integration tests @ 2017-11-13 15:47:12 UTC
18624d6798 Merge pull request #44491 from Ch3LL/ssh_raw
3dc8673417 change class name to raw
308596ac8d Add salt-ssh raw integration tests
PR #44492: (twangboy) Fix unit.utils.test_cloud for Windows @ 2017-11-13 15:44:31 UTC
aa17bfa8e7 Merge pull request #44492 from twangboy/win_skip_mode_check
2f30ad93b1 Skips mode check in Windows
PR #44484: (Ch3LL) Add orchestration tests when target exists or not @ 2017-11-10 19:24:22 UTC
5b95495e75 Merge pull request #44484 from Ch3LL/orch_test
f3ec6df76e Add orchestration tests when target exists or not
PR #44480: (Ch3LL) Add integration pillar command line test @ 2017-11-10 19:14:31 UTC
62c42ca6fb Merge pull request #44480 from Ch3LL/override_pillar
12fed1b4d8 Add integration pillar command line test
PR #44317: (Ch3LL) Add state tests and state request system to salt-ssh @ 2017-11-10 18:28:43 UTC
cc08ad2edc Merge pull request #44317 from Ch3LL/ssh_test
46bce3bd5e add additional parser argument for ssh integration tests
e9231430b5 remove logic similar to cloud/proxy tests
c731eb8ea6 add ssh dir to test runner when --ssh-tests set
8089a885c2 add wipe function to other run_ssh method
200b12ae6a change versionadded salt version
e3ebb5e9b3 fix comment and variables
faef0886a7 Add state tests and state request system to salt-ssh
PR #44478: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-11-10 18:00:56 UTC
6669035a30 Merge pull request #44478 from rallytime/merge-2017.7
9fcc2a70b5 Merge branch '2016.11' into '2017.7'
PR #44444: (twangboy) LGPO: Issue with Maximum Password Age @ 2017-11-10 17:26:53 UTC
60719d0683 Merge pull request #44444 from twangboy/win_lgpo_non_zero
de6b394445 Remove unneeded functions
ee0914f7e9 Fix some lint, remove unnecessary function
d52a7c12db Fix typo in PasswordComplexity policy
44f8f43812 Fix problem where 0 isn't 0
PR #44467: (twangboy) Fix unit.test_doc for Windows @ 2017-11-10 15:21:58 UTC
4f3a79df07 Merge pull request #44467 from twangboy/win_fix_test_doc
0a9e862bf4 Use regex to split
PR #44443: (Ch3LL) Add salt-ssh grains.items test @ 2017-11-09 00:42:11 UTC
ff4f13877f Merge pull request #44443 from Ch3LL/ssh_grains
5d1a9af4b5 Add salt-ssh grains.items test
PR #44429: (Ch3LL) Fix orch doc from pillat.get to pillar.get @ 2017-11-07 23:06:38 UTC
dcdf2d4c90 Merge pull request #44429 from Ch3LL/orch_doc
38ca5520f0 Fix orch doc from pillat.get to pillar.get
ISSUE #42568: (clallen) Orchestration runner doesn't populate __pillar__ based on pillarenv (refs: #43817)
PR #43817: (The-Loeki) Orchestrate runner forces pillarenv and saltenv to None @ 2017-11-07 06:00:16 UTC
62c4addef8 Merge pull request #43817 from The-Loeki/orch-pillarenv
3fd652623c orchestrate runner: retain default envs
PR #44408: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-11-06 15:53:00 UTC
9e4708b7b9 Merge pull request #44408 from rallytime/merge-2017.7
edbbd5fc2b Merge branch '2016.11' into '2017.7'
5e289f42ba Merge pull request #44383 from gtmanfred/2016kitchen
b65f4ea4ea switch salt-jenkins over to saltstack
cab54e34b5 Merge pull request #44173 from twangboy/win_system_docs
8e111b413d Fix some of the wording and grammar errors
a12bc5ae41 Use google style docstrings
7aaea1d179 Merge pull request #44304 from jfindlay/cron_id
cc038c5bec states.cron identifier defaults to name
e4dbbde734 Merge pull request #44322 from rossengeorgiev/saltssh-docs-update
b18f2e5a6d fix program name and description for --static
5b10918f02 updated CLI docs for salt-ssh
PR #44358: (The-Loeki) Kubernetes client certificate file usage fix @ 2017-11-03 21:51:27 UTC
b11da0d2da Merge pull request #44358 from The-Loeki/kube-client-cert-file
35a8b0bb38 Kubernetes client certificate file usage fix
PR #44347: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-11-03 21:48:21 UTC
1974e52c06 Merge pull request #44347 from rallytime/merge-2017.7
9bad04b94b Merge branch '2016.11' into '2017.7'
4e6f09e3eb Merge pull request #44345 from gtmanfred/2016kitchen
79b8b2d0bf remove binding
209847c8c2 Merge pull request #44342 from gtmanfred/2016kitchen
c50508f0b7 render template files platforms.yml and driver.yml
1be65224cb Merge pull request #44339 from corywright/issue-44336-fix-archive-tar-docs-2016-11
9c1c35a59f Remove leading dash (-) from options in archive.tar documentation
bebc33daf5 Merge pull request #44295 from HeinleinSupport/issue44272
f972715a45 fixes issue #44272
e7ca9f8407 Merge pull request #44286 from gtmanfred/2016.11
193e715e37 use our git repo for kitchen-salt
PR #44364: (Ch3LL) Include disk size check for test_spm_build_big_file test @ 2017-11-01 13:57:24 UTC
aea9f4a115 Merge pull request #44364 from Ch3LL/fix_size_test
952c6bfea4 Include file size check for test_spm_build_big_file test
ISSUE #44239: (boltronics) --progress fails when hosts routed via syndic (refs: #44273)
PR #44273: (DmitryKuzmenko) Workaround progressbar failure if minion is behind syndic. @ 2017-10-31 17:07:17 UTC
609de9367a Merge pull request #44273 from DSRCorporation/bugs/44239_syndic_progress
e1a7605623 Workaround progressbar failure if minion is behind syndic.
PR #44350: (gtmanfred) update salt-jenkins repo to 2017.7 @ 2017-10-30 21:31:30 UTC
eef6dbfa58 Merge pull request #44350 from gtmanfred/2017.7
cf71e3d9f2 update salt-jenkins repo to 2017.7
PR #44346: (gtmanfred) remove binding from erb template rendering (2017.7) @ 2017-10-30 20:57:19 UTC
d586b3bf97 Merge pull request #44346 from gtmanfred/2017.7
bf577c3d8b remove binding
PR #44343: (gtmanfred) render template files platforms.yml and driver.yml (2017.7) @ 2017-10-30 20:04:22 UTC
547aac6658 Merge pull request #44343 from gtmanfred/2017.7
ec24fbc0c2 render template files platforms.yml and driver.yml
ISSUE #44336: (corywright) Docs for archive.tar should not use leading dash for tar options (refs: #44339, #44338)
PR #44338: (corywright) Remove leading dash from options in archive.tar docs (2017.7 and develop) @ 2017-10-30 18:59:33 UTC
6e2a74c18b Merge pull request #44338 from corywright/issue-44336-fix-archive-tar-docs-2017-7-and-newer
49b0abc284 Remove leading dash (-) from options in archive.tar documentation
PR #44265: (Ch3LL) Add service.status integration test @ 2017-10-30 15:00:12 UTC
71923bed97 Merge pull request #44265 from Ch3LL/service_test
716aabc0bf Merge branch '2017.7' into service_test
dd5c823210 remove skipIf import
ff92f31cbe remove skipif for docker
c13f37eee4 change service name depending on os
980c43ebc9 change skip message check to docker
3955537609 change skip if check to docker
aa8875a0e2 change service name to docker
654071028b change service to crond
7911b4b3eb Add service.status integration test
PR #44294: (nasenbaer13) Boto asg fixes, Backport of #43858 @ 2017-10-30 14:48:52 UTC
PR #43858: (nasenbaer13) Boto_ASG fixes for scaling policy rate limiting and tag conversion (refs: #44294)
8ae9769bfb Merge pull request #44294 from eyj/boto_asg
f5ad6aeb70 Debug log added when throttled by API
c05d9aeced Encode tags as utf-8, retry policy readout
PR #44312: (rallytime) Back-port #44287 to 2017.7 @ 2017-10-30 14:25:56 UTC
PR #44287: (jf) Fix utils.files.guess_archive_type to recognize the "tbz" extension as well (refs: #44312)
68a9bebf90 Merge pull request #44312 from rallytime/bp-44287
4d02e61f97 Merge branch '2017.7' into bp-44287
ba0eaae95e Fix utils.files.guess_archive_type to recognize the "tbz" extension as well (also tidy up list of extensions)
ISSUE #44258: (oarmstrong) docker_container.running recreates containers with multiple links (refs: #44262)
PR #44311: (rallytime) Back-port #44262 to 2017.7 @ 2017-10-30 14:25:35 UTC
PR #44262: (oarmstrong) docker_container.running sort list of links (refs: #44311)
b8854e27c0 Merge pull request #44311 from rallytime/bp-44262
72d617cfbe Merge branch '2017.7' into bp-44262
ae34a15503 docker_container.running sort list of links
PR #44314: (gtmanfred) update .kitchen.yml to run py3 tests too @ 2017-10-30 14:23:15 UTC
48df79ef77 Merge pull request #44314 from gtmanfred/2017.7
54265769c4 Merge branch '2017.7' into 2017.7
PR #44316: (rallytime) Fix lint failure on 2017.7 branch @ 2017-10-27 18:36:08 UTC
dbc5e224e9 Merge pull request #44316 from rallytime/fix-lint
6d2490f6a0 Fix lint failure on 2017.7 branch
39262b625e update .kitchen.yml to run py3 tests too
PR #44279: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-10-27 16:17:19 UTC
b2b0c770a4 Merge pull request #44279 from rallytime/merge-2017.7
8237f45a46 Add print_function to __future__ import list
055b0701de Lint fix from sloppy merge conflict resolution
1c3cb5c6a4 Merge branch '2016.11' into '2017.7'
8a1ea165af Merge pull request #44259 from gtmanfred/2016.11
56a3ad8f68 fix pylint comments
4add666db1 add comment to Gemfile and move copyartifacts
b4c8f7eb57 fix pylint
392fd4f837 try newest salttesting
79251287d0 add logging
38963d5a82 use transport if not set in state_file
10e309a64f which vagrant should go to stderr
9307564de0 fix output columns
2da22f87e1 test opennebula
9f38f16905 add opennebula to Gemfile
7465f9b27a add script for copying back artifacts
255118cfd7 run tests with kitchen
9d6bc8509b Merge pull request #44268 from twangboy/win_fix_lgpo_typo
a6a4c10a77 Fix typo
0beb65a283 Merge pull request #44269 from terminalmage/fix-log-message
bc9cd65496 Fix log message in salt.utils.gitfs
304dd2529d Merge pull request #44160 from gtmanfred/directory
a7d3d668f4 missed removing changes in the next test
ac0b5ec440 fix test
d3d00c3e62 add changes to test return
e10395483d Merge pull request #44205 from rallytime/bp-44177
b9940f8521 Fixing default redis.host in documentation
PR #44291: (Ch3LL) add saltutil.refresh_pillar test @ 2017-10-27 15:19:43 UTC
bd5b9dd0aa Merge pull request #44291 from Ch3LL/pillar_test
34e2955445 add saltutil.refresh_pillar test
PR #44267: (twangboy) Fix type and Py3 issues in LGPO module @ 2017-10-27 14:27:50 UTC
ba17a1c4d0 Merge pull request #44267 from twangboy/win_fix_lgpo
5d22d34cac Use unicode_literals
40636397d8 Fix set for Py3
8f8c706426 Fix typo
PR #44285: (Ch3LL) add spm integration tests for remove and build @ 2017-10-26 21:20:10 UTC
e16707c403 Merge pull request #44285 from Ch3LL/all_spm
1f77f3e6a3 add skipif logic for fallocate cmd
03b5c4bc6d add spm integration tests for remove and build
PR #44301: (twangboy) Fix test_pydsl on Windows @ 2017-10-26 21:14:21 UTC
6392896a22 Merge pull request #44301 from twangboy/win_fix_test_pydsl
6db23757bc Fix test_pydsl on Windows
PR #44293: (UtahDave) Fix documentation grammar and spelling errors @ 2017-10-26 13:05:31 UTC
8787d02688 Merge pull request #44293 from UtahDave/fix_unittest_docs
c919648ab4 Fix documentation grammar and spelling errors
PR #44248: (Ch3LL) SPM tests: use _spm_build_files method during test_build setup @ 2017-10-25 19:45:03 UTC
6e33743c1a Merge pull request #44248 from Ch3LL/spm_create_repo
0a387c2ecd fix pylint
f383f05a93 Add SPM create_repo integration test
PR #44253: (Ch3LL) Add multiple spm integration tests @ 2017-10-25 13:36:03 UTC
bd75be24ca Merge pull request #44253 from Ch3LL/spm_install
9e2e785034 add spm tests to test runner
4729ccd32b Add multiple spm integration tests
PR #44254: (twangboy) Fix unit.modules.test_win_groupadd for Windows @ 2017-10-25 13:33:40 UTC
75ee1ebc50 Merge pull request #44254 from twangboy/win_fix_test_win_groupadd
609361bf48 Fix some lint errors
1f44d8d5e6 Document helper functions
b0caec320e Move _get_all_groups up to the top
7a3ff9387d Mock the rest of the tests
5ce14df82c Change how members are retrieved in win_groupadd
6ab82394be Set up mocking
PR #44266: (Ch3LL) Add state, grains and service proxy tests @ 2017-10-25 13:08:50 UTC
4c23fa63bb Merge pull request #44266 from Ch3LL/proxy_tests
e5701b472d Add state, grains and service proxy tests
ISSUE #43187: (mirceaulinic) How to point from an execution module that a certain function failed (refs: #44244)
PR #44244: (mirceaulinic) Add explicit non-zero retcode to napalm config functions @ 2017-10-24 09:23:40 UTC
c849f350ba Merge pull request #44244 from cloudflare/add-retcode
a1f27c9f00 Add explicit non-zero retcode to napalm config functions
ISSUE #44227: (rklaren) salt-cloud leaves a broken vm around when the salt bootstrap fails (refs: #44228)
PR #44228: (rklaren) Fixes #44227, make salt-cloud/libvirt cleanup after errors more robust @ 2017-10-23 17:09:35 UTC
ISSUE #19532: (stolendog) salt-ssh running git clone with not root user (refs: #43769)
ISSUE #10582: (mtorromeo) Git ssh helper may be unable run (refs: #43769)
PR #44008: (mtorromeo) Backport #43769 to 2017.7 @ 2017-10-23 14:19:57 UTC
PR #43769: (mtorromeo) Copy git ssh-id-wrapper to /tmp only if necessary (Fixes #10582, #19532) (refs: #44008)
01e7bab990 Merge pull request #44008 from mtorromeo/git-noexec-fix
a7a841d9d2 Merge branch '2017.7' into git-noexec-fix
d177240cfc Merge branch '2017.7' into git-noexec-fix
a63e6ca963 Copy git ssh-id-wrapper to /tmp only if necessary (Fixes #10582, Fixes #19532)
PR #44202: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-10-23 14:18:30 UTC
85c0ef493f Merge pull request #44202 from rallytime/merge-2017.7
99ff7a5c12 Merge branch '2016.11' into '2017.7'
09ddfd0c08 Merge pull request #44167 from garethgreenaway/44140_debian_ip_fixes
5f7555846f When looping through the various pre, post, up and down commands put them into the interface dict using the right internet family variable.
9f9e936b52 Merge pull request #43830 from rallytime/bp-43644
12845ae802 Several fixes for RDS DB parameter group management
07db6a3d8b Merge pull request #43994 from oeuftete/fix-manage-runner-presence
f3980d7d83 Fix manage.present to show lost minions
a07537e258 Merge pull request #44188 from terminalmage/issue44150
0692f442db yumpkg: Check pkgname instead of name to see if it is a kernel pkg
715edc0cea Merge pull request #44158 from rallytime/bp-44089
534faf0b7a Catch on empty Virtualbox network addr #43427
PR #44208: (twangboy) Fix some lint in PR: 44080 @ 2017-10-20 16:42:02 UTC
d7dc2bd0e8 Merge pull request #44208 from twangboy/win_fix_group.present
61e2e9ccda Fix some lint
PR #43843: (twangboy) Fix unit.states.test_mount for Windows @ 2017-10-20 14:27:25 UTC
c6d27ada51 Merge pull request #43843 from twangboy/win_unit_test_mount
a862e0bf2d Remove unneeded import
d78f27466d Fix unit.states.test_mount for Windows
PR #44111: (anlutro) Try to correctly parse debian codename from /etc/os-release @ 2017-10-19 22:23:26 UTC
372820ea38 Merge pull request #44111 from alprs/fix-deb8-py3-oscodename
1e1e5a3ff6 try to correctly parse debian codename from /etc/os-release
PR #44187: (twangboy) Fix pickling errors on Windows @ 2017-10-19 20:36:51 UTC
75136152c1 Merge pull request #44187 from twangboy/win_fix_unit_test_daemons.py
64d2e4f732 Fix pickling errors on Windows
ISSUE #44181: (jonans) Scheduler with multiple when values doesn't run (refs: #44186)
PR #44186: (garethgreenaway) [2017.7] scheduler fixes @ 2017-10-19 20:36:04 UTC
7a89cd8697 Merge pull request #44186 from garethgreenaway/44181_scheduler_multiple_whens
7eef3b3571 Adding a copy.deepcopy to the for loop that looks for old jobs to avoid stale jobs ending up in the list.
PR #43896: (twangboy) Fix win_lgpo execution module @ 2017-10-19 20:13:18 UTC
1d16ae8ba7 Merge pull request #43896 from twangboy/win_fix_lgpo_scom
648d1b8d99 Catch CommandExecutionError
0040082d0a Fix pylint error
91258cd6a8 Fix typo
261dba347d Put the file.remove in a try/except/else block
020c2a2b85 Fix syntax error
d5bec99126 Fix some lint
b96186d60d Fix INSTALL_LANGUAGE
5471bd521f Fix problem with file handle
5ec58c6200 Use System Install Language as default fallback
f9ad446019 Fix win_lgpo execution module
PR #44080: (twangboy) Fix a regression in group.present in Windows @ 2017-10-19 20:10:44 UTC
98356b86af Merge pull request #44080 from twangboy/win_fix_group.present
29bc80ff87 Improve get_sam_name
ef759a3875 Fix example in function docs for get_sam_name
43740c5fed Document 15 character limit
83f36cc2ef Account for 15 character limit in hostname
aa278966de Remove *args, pass gid as a keyword
5230ecd7e1 Accept *args
PR #44171: (Ch3LL) Add SPM Build Integration Tests @ 2017-10-19 19:49:14 UTC
5ef124bf2d Merge pull request #44171 from Ch3LL/spm_int
cd79e9444e remove unneded kwarg
1541376c4f Add spm build test
PR #44157: (benediktwerner) Added 'versionadded' tags to sensehat modules @ 2017-10-19 14:13:31 UTC
34a843252d Merge pull request #44157 from benediktwerner/2017.7
bd825b51cc Changed sensehat versionadded from 2017.7 to 2017.7.0
f1d3c5bbcf Added 'versionadded' tags to sensehat modules
PR #44164: (terminalmage) Fix examples in docker_container.{stopped,absent} docstrings @ 2017-10-19 14:12:37 UTC
1427c72e1e Merge pull request #44164 from terminalmage/fix-docker-docstring
7b46489e33 Fix examples in docker_container.{stopped,absent} docstrings
PR #44168: (twangboy) Fix unit.test_auth for Windows @ 2017-10-19 14:12:22 UTC
77969c4161 Merge pull request #44168 from twangboy/win_skip_pam_eath
bb1d2eb85b Skip tests that are failing on PAM eauth
PR #44151: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-10-18 16:52:30 UTC
88a776d9d2 Merge pull request #44151 from rallytime/merge-2017.7
6aa8f03a4a Merge branch '2016.11' into '2017.7'
0cd493b691 Merge pull request #44131 from rallytime/bp-44029
3a68e356f8 Merge pull request #44093 from gtmanfred/fix-44087
5455c5053b fix pylint
f749cafa25 don't filter if return is not a dict
c785d7a847 Merge pull request #44122 from cachedout/gpg_pr_template
e41e3d76be Typo fix
37c7980880 Add note about GPG signing to PR template
bf90ea1f51 Merge pull request #44124 from rallytime/merge-2016.11
59861291c8 Merge branch '2016.11.8' into '2016.11'
57623e2abe Merge pull request #44028 from rallytime/bp-44011
89e084bda3 Do not allow IDs with null bytes in decoded payloads
206ae23f15 Don't allow path separators in minion ID
13f3ffa83a Merge pull request #44097 from gtmanfred/openneb
c29655b2c2 Merge branch '2016.11' into openneb
bd2490b149 OpenNebula does not require the template_id to be specified
ac3e4df964 Merge pull request #44110 from roaldnefs/fix-doc-local-returner
efd58f7594 Merge branch '2016.11' into fix-doc-local-returner
881f1822f2 Format fix code example local returner doc
ISSUE #43918: (mwerickso) subset argument does not work with saltmod.state (refs: #43933)
PR #43933: (gtmanfred) if expect_minions is passed use that instead @ 2017-10-18 16:43:39 UTC
0b47eb7242 Merge pull request #43933 from gtmanfred/2017.7
272dcc6ba5 add inline comment about popping expect_minions
b615ce1762 if expect_minions is passed use that instead
PR #44081: (skizunov) Windows: Fix usage of pkgrepo state @ 2017-10-18 16:16:46 UTC
36da1a7fac Merge pull request #44081 from skizunov/develop3
351d16840b Move strip_uri to salt/utils/pkg/deb.py
f54c7a6f01 Windows: Fix usage of pkgrepo state
PR #43913: (twangboy) Fix unit.templates.test_jinja for Windows @ 2017-10-17 21:09:05 UTC
afcaa0c591 Merge pull request #43913 from twangboy/win_fix_test_jinja
a4e2d8059d Fix unit.templates.test_jinja for Windows
PR #43917: (twangboy) Fix unit.test_pillar for Windows @ 2017-10-17 21:06:46 UTC
fc5754c6a1 Merge pull request #43917 from twangboy/win_unit_test_pillar
00dbba5712 Fix unit.test_pillar for Windows
PR #44133: (cachedout) Fix typos in parallel states docs @ 2017-10-17 15:24:19 UTC
6252f82f58 Merge pull request #44133 from cachedout/fix_parallel_docs
8d1c1e21f0 Fix typos in parallel states docs
PR #44135: (timfreund) Insert missing verb in gitfs walkthrough @ 2017-10-17 14:32:13 UTC
0d3f5db867 Merge pull request #44135 from timfreund/insert_missing_verb
9557504b75 Insert missing verb in gitfs walkthrough
PR #44055: (nasenbaer13) Activate jid_queue also for SingleMinions to workaround (Backport) @ 2017-10-16 20:14:52 UTC
PR #43860: (nasenbaer13) Activate jid_queue also for SingleMinions (occurs on reconnect) (refs: #44055)
a9700f6061 Merge pull request #44055 from eyj/jid_queue
4bdd5bbf6b Merge branch '2017.7' into jid_queue
facef2227d Merge branch '2017.7' into jid_queue
2fedcec6bb Merge branch '2017.7' into jid_queue
255aa94c64 Activate jid_queue also for SingleMinions to workaround 0mq reconnection issues
PR #44125: (rallytime) [2017.7] Merge forward from 2017.7.2 to 2017.7 @ 2017-10-16 20:02:25 UTC
ISSUE #43307: (marek-knappe) Filesystem creation is failing on newly created LV (refs: #44029)
PR #44029: (msummers42) addresses issue #43307, disk.format_ to disk.format (refs: #44131) @ 2017-10-16 19:59:20 UTC
PR #44079: (skizunov) opkg: Fix usage with pkgrepo.managed @ 2017-10-16 19:58:13 UTC
d0bbe65ffa Merge pull request #44079 from skizunov/develop2
0614d1af30 Merge branch '2017.7' into develop2
b6b12fe495 opkg: Fix usage with pkgrepo.managed
PR #44090: (pratik705) Fix create_attach_volumes salt-cloud action for gcp @ 2017-10-16 19:04:22 UTC
22a8253595 Merge pull request #44090 from pratik705/fix-create_attach_volumes_salt-cloud_action-GCP
3eefd334c5 Fixed "create_attach_volumes" salt-cloud action for GCP
PR #44121: (benediktwerner) Fixed code snippet in unit testing documentation @ 2017-10-16 18:28:36 UTC
888e5f51a2 Merge pull request #44121 from benediktwerner/2017.7
1319c822bd Fixed code snippet in unit testing doc
PR #44098: (twangboy) Return multiprocessing queue in LogSetupMock class @ 2017-10-16 18:14:30 UTC
9fe94d7843 Merge pull request #44098 from twangboy/win_mock_test_parsers
cc43ca27af Return multiprocessing queue in LogSetupMock class
PR #44118: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-10-16 17:01:38 UTC
0ee04eaf1d Merge pull request #44118 from rallytime/merge-2017.7
bbec47afbc Merge branch '2016.11' into '2017.7'
c960ca32c2 Merge pull request #44092 from techhat/awsunicode
bbd9db4d00 One more encoding
0e8b325667 Apparently __salt_system_encoding__ is a thing
1e7211838d Use system encoding
1af21bbe5e Made sure that unicoded data is sent to sha256()
d89c317d96 Merge pull request #44021 from whiteinge/cpstats-attribute-error
bf14e5f578 Also catch cpstats AttributeError for bad CherryPy release ~5.6.0
bbdabe242a Merge pull request #44025 from dayid/lover_typo
385980c21a Merge branch '2016.11' of https://github.com/saltstack/salt into lover_typo
266dc00a23 Typo correction of lover to lower
d8f3891a5e Merge pull request #44030 from rallytime/merge-2016.11
53eaf0d75c Merge branch '2016.3' into '2016.11'
64fd839377 Merge pull request #44010 from Ch3LL/2016.3.7_follow_up
9a00302cd8 fix 2016.3.7 release notes merge conflict
63da1214db Do not allow IDs with null bytes in decoded payloads
ee792581fc Don't allow path separators in minion ID
8aab65c718 fix 2016.3.7 release notes merge conflict
bd73dcb02c Merge pull request #43977 from Ch3LL/3.8_sec
5fb3f5f6b1 Add Security Notes to 2016.3.8 Release Notes
PR #44099: (twangboy) Skip Master, Minion, and Syndic parser tests @ 2017-10-16 16:07:00 UTC
28fa097b9b Merge pull request #44099 from twangboy/win_skip_test_parsers
caf086c05a Skip Master, Minion, and Syndic parser tests
PR #44106: (roaldnefs) Fix mattermost returner documentation @ 2017-10-16 13:12:23 UTC
dbf112ead7 Merge pull request #44106 from roaldnefs/fix-doc-mattermost_returner
b3761a0401 Fix doc indentation in mattermost_returner
PR #44054: (nasenbaer13) Backport of missing delete_on_termination @ 2017-10-13 15:45:25 UTC
PR #43859: (nasenbaer13) Add missing delete_on_termination passthrough. Adapt docs. (refs: #44054)
fd2c51b76c Merge pull request #44054 from eyj/boto_lc
34d4629a64 Merge branch '2017.7' into boto_lc
9efd63526a Adapted documentation of delete_on_termination parameter
eb2bfd047b Add missing delete_on_termination passthrough. Adapt docs.
PR #44076: (Ch3LL) Add spm shell tests @ 2017-10-13 14:32:19 UTC
b61ed96268 Merge pull request #44076 from Ch3LL/spm_test
d2e91c33bd Add spm shell tests
PR #44051: (twangboy) Fix some documentation formatting issues in the win_dacl state @ 2017-10-12 15:40:17 UTC
e38f313ac0 Merge pull request #44051 from twangboy/win_fix_docs_dacl
377d6b6171 Fix some docs in the win_dacl state module
PR #44066: (Ch3LL) Add Known CherryPy Issue to 2017.7.2 Release Notes @ 2017-10-12 15:18:25 UTC
a85837d72b Merge pull request #44066 from Ch3LL/cherry_release
8e597fcce9 Add Known CherryPy Issue to 2017.7.2 Release Notes
ISSUE #43643: (doublez13) salt-ssh: multiple targets fails after upgrade to 2017.7 (refs: #43889)
ISSUE #43449: (ecgg) salt-ssh -L with hosts down or unreachable returns wrong results (refs: #43889)
PR #43889: (CorvinM) Fix issue with using roster_defaults with flat or cloud rosters. @ 2017-10-11 23:22:11 UTC
PR #44031: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-10-11 22:03:31 UTC
3ad1c6d1d9 Merge pull request #44031 from rallytime/merge-2017.7
1d4a6c3949 Lint: Fixup undefined variable errors
788ad0609a Merge branch '2016.11' into '2017.7'
0dbf41e79e Merge pull request #44011 from Ch3LL/2016.11.7_follow_up
c0149101c0 Do not allow IDs with null bytes in decoded payloads
19481423dd Don't allow path separators in minion ID
d61300df20 Merge pull request #44023 from Ch3LL/11.9rn
7f9015eb41 Add 2016.11.9 Release Note File
9ff53bf63a Merge pull request #44019 from benediktwerner/2016.11
bc53598027 Fixed spelling mistake in salt_bootstrap tutorial
6c30344824 Added missing tutorial docs to the tutorial index
364523f5f8 Merge pull request #43955 from meaksh/2016.11-fix-2291
a81b78381b Merge branch '2016.11' into 2016.11-fix-2291
44bc91bb98 Enable '--with-salt-version' parameter for setup.py script
fec714b91d Merge pull request #43962 from bobrik/kmod-built-in
95ab901553 Report built-in modiles in kmod.available, fixes #43945
e434c39c4e Merge pull request #43960 from cro/ldap_nopw_bind2
962a20cf4b Require that bindpw be non-empty if auth.ldap.anonymous=False
9df3d91d8f Release notes blurb for change to bindpw requirements
e9dfda2177 Merge pull request #43991 from Ch3LL/3.8_sec_2
1977df8462 Add Security Notes to 2016.3.8 Release Notes
2346d2691e Merge pull request #43968 from rossengeorgiev/fix-zenoss-prod_state
e6d31c1ea6 fix zenoss state module not respecting test=true
8d56a5ac45 Merge pull request #43776 from Ch3LL/2016.11.8_docs
f72bc00000 [2016.11] Bump latest and previous versions
21bf71c3f5 Merge pull request #43976 from Ch3LL/11.8_sec
f0c3184288 Add Security Notes to 2016.11.8 Release Notes
1d5397ab5b Merge pull request #43973 from terminalmage/fix-grains.has_value
bf45ae6e6a Fix grains.has_value when value is False
9ac3f2ea7b Merge pull request #43888 from rallytime/bp-43841
87d676f08a add -n with netstat so we don't resolve
f880ac4c08 Merge pull request #43916 from dereckson/fix-typo-cloud-scaleway
15b8b8a9f4 Fix typo in salt-cloud scaleway documentation
PR #44045: (isbm) Bugfix: always return a string "list" on unknown job target type. @ 2017-10-11 21:58:12 UTC
5db1e8c6ca Merge pull request #44045 from isbm/isbm-tgttype-fix-2017-port
471ff35c2f Bugfix: always return a string "list" on unknown job target type.
ISSUE #43949: (arthurlogilab) [logger] [sentry] KeyError: 'SENTRY_PROJECT' (refs: #43950)
PR #44026: (rallytime) Back-port #43950 to 2017.7 @ 2017-10-11 15:27:49 UTC
PR #43950: (arthurlogilab) [log/sentry] avoid KeyError: 'SENTRY_PROJECT' (refs: #44026)
6c8f7fd5ec Merge pull request #44026 from rallytime/bp-43950
a37e0bad62 [log/sentry] avoid KeyError: 'SENTRY_PROJECT'
PR #44012: (Ch3LL) Security Fixes for 2017.7.2 (refs: #44027) @ 2017-10-10 20:04:08 UTC
369ee8a132 Merge pull request #44012 from Ch3LL/2017.7.1_follow_up
92e05cf1c0 Don't allow path separators in minion ID
70133aa305 Do not allow IDs with null bytes in decoded payloads
PR #44024: (Ch3LL) Add 2017.7.3 Release Note File @ 2017-10-10 20:03:12 UTC
4fe029a0ab Merge pull request #44024 from Ch3LL/7.3rn
027f509368 Add 2017.7.3 Release Note File
ISSUE #43997: (unthought) gce cloud provider breaks for make_master: True (refs: #43998)
PR #43998: (unthought) Fix gce make_master @ 2017-10-10 20:01:25 UTC
e484d16817 Merge pull request #43998 from unthought/fix-gce-make_master
6e9f0fa24e Fix GCE provider: #create returns bootstrap result
ISSUE #44013: (DenisBY) pkgrepo.managed broken in 2017.7.2 (refs: #44016)
PR #44016: (terminalmage) Fix on_header callback when not redirecting and no Content-Type present @ 2017-10-10 19:59:24 UTC
82b92d54b3 Merge pull request #44016 from terminalmage/issue44013
d594b95f92 No need to set a specific encoding if one hasn't been provided via the headers
425ede4b84 Fix on_header callback when not redirecting and no Content-Type present
PR #43952: (t0fik) add requisites to stateconf ( backport #43920) @ 2017-10-10 13:03:31 UTC
PR #43777: (Ch3LL) [2017.7] Bump latest and previous versions @ 2017-10-09 17:21:57 UTC
a4358dfa36 Merge pull request #43777 from Ch3LL/2017.7.2_docs
410c624f7a [2017.7] Bump latest and previous versions
PR #43978: (Ch3LL) Add Security Notes to 2017.7.2 Release Notes @ 2017-10-09 17:20:04 UTC
2a064c1a72 Merge pull request #43978 from Ch3LL/7.2_sec
57fd6f7bcb Add Security Notes to 2017.7.2 Release Notes
PR #43932: (techhat) Don't try to modify dict while looping through it @ 2017-10-06 21:20:54 UTC
d9530e3c52 Merge pull request #43932 from techhat/moddict
4a77560646 Don't try to modify dict while looping through it
PR #43956: (terminalmage) Fix fileclient's get_url when redirecting to a redirect @ 2017-10-06 21:19:41 UTC
39893a1dab Merge pull request #43956 from terminalmage/fix-get_url-redirects
9a4f6a260f Fix fileclient's get_url when redirecting to a redirect
PR #43943: (twangboy) Fix unit.utils.test_utils for Windows @ 2017-10-06 19:35:24 UTC
1baf286719 Merge pull request #43943 from twangboy/win_unit_test_utils
254dac7723 Fix unit.utils.test_utils for Windows
89200ff28e rebase from 2017.7.2
PR #43939: (terminalmage) Fix typo in log message @ 2017-10-05 23:20:04 UTC
a8f1750323 Merge pull request #43939 from terminalmage/fix-typo
29d8cf4f26 Fix typo in log message
ISSUE #43909: (frogunder) state.highstate not working on py3 setup (refs: #43910)
ISSUE #43605: (cruscio) Module.Run: Passed invalid arguments to state.apply: can't serialize dict_keys(['task.create_task']) (refs: #43910)
PR #43910: (terminalmage) Don't put unserializable dict.keys() into state return @ 2017-10-05 20:33:47 UTC
1a718eb1ed Merge pull request #43910 from terminalmage/issue43605
042e092ac8 Don't put unserializable dict.keys() into state return
ISSUE #41894: (DR3EVR8u8c) Salt-cloud can't resize root volume with public ami images (refs: #43907)
ISSUE #39257: (aig787) Using del_root_vol_on_destroy option in salt-cloud gives IndexError (refs: #43907)
PR #43927: (rallytime) Back-port #43907 to 2017.7 @ 2017-10-05 20:10:16 UTC
PR #43934: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-10-05 20:07:36 UTC
4fcd4709ea Merge pull request #43934 from rallytime/merge-2017.7
eaca3291e2 Merge branch '2016.11' into '2017.7'
2ab7549d48 Merge pull request #43884 from UtahDave/2016.11local
e3b2857285 Merge branch '2016.11' into 2016.11local
4b882d4272 Merge pull request #43869 from terminalmage/issue43522
fe28b0d4fb Only join cmd if it's not a string
8c671fd0c1 Update SaltConf banner per Rhett's request
a2161efda3 Merge pull request #43707 from terminalmage/issue43373
3ebde1895f Merge branch '2016.11' into issue43373
e580ed4caa Merge branch '2016.11' into issue43373
5b3be6e8af Fix failing unit test
f73764481b Add missing support for use/use_in requisites to state.sls_id
ISSUE #43658: (kvnaveen) KeyError: 'as_dict' [DEBUG ] LazyLoaded nested.output (refs: #43886)
PR #43886: (techhat) Fix object_to_dict in azure @ 2017-10-05 19:33:56 UTC
7d174172a0 Merge pull request #43886 from techhat/azuredict
223a1eea83 Fix object_to_dict in azure
PR #43899: (gtmanfred) enable tox for tests @ 2017-10-04 15:08:16 UTC
7038248820 Merge pull request #43899 from gtmanfred/2017.7
51eca1a6bd enable tox for tests
PR #43828: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-10-04 13:10:13 UTC
a5abe33e1c Merge pull request #43828 from rallytime/merge-2017.7
2ff02e4320 Merge branch '2016.11' into '2017.7'
85b3aa332a Merge pull request #43807 from terminalmage/issue43522
d8708bf698 cmdmod: Don't list-ify string commands on Windows
ea8d273c2b Merge pull request #43768 from vutny/fix-pylint-deprecation-warnings
f8b3fa9da1 Merge branch '2016.11' into fix-pylint-deprecation-warnings
651ed16ad3 Fix Pylint deprecated option warnings
PR #43854: (keesbos) Map __env__ in git_pillar before sanity checks @ 2017-10-02 20:44:53 UTC
PR #43847: (cachedout) Fix to module.run @ 2017-10-02 19:25:03 UTC
c81e8457b8 Merge pull request #43847 from cachedout/module_run_compare
b11f8c8f29 Merge pull request #17 from terminalmage/pr-43847
93eaba7c54 Use six.iterkeys() instead of dict.keys()
5d56a03a67 Improve failures for module.run states
71780beb5a Merge branch '2017.7' into module_run_compare
ISSUE #43819: (mephi42) archive.extracted shows the http password in the comment field on failure (refs: #43844)
PR #43844: (garethgreenaway) [2017.7] Changes to states/file.py and states/archived.py @ 2017-10-01 09:08:48 UTC
dd01e0ce67 Merge pull request #43844 from garethgreenaway/43819_redact_url_additions
c58c72aff9 When using URLs in archive.extracted, on failure the username & password is in the exception. Calling salt.utils.url.redact_http_basic_auth to ensure the credentials are redacted.
f0b985cbbe Merge branch 'module_run_compare' of ssh://github.com/cachedout/salt into module_run_compare
aefc773c2f Merge branch '2017.7' into module_run_compare
PR #43840: (twangboy) Fix unit.states.test_augeas for Windows @ 2017-09-29 21:53:21 UTC
1f52546eab Merge pull request #43840 from twangboy/win_fix_test_augeas
fd1d6c31de Fix unit.states.test_augeas for Windows
ISSUE #43553: (dafyddj) Vagrant setup (Windows guest) broken on upgrade to 2017.7 (refs: #43801)
PR #43801: (terminalmage) Properly handle UNC paths in salt.utils.path.readlink() @ 2017-09-29 09:58:02 UTC
c6fd2cd452 Merge pull request #43801 from terminalmage/issue43553
66e6e89dc7 Properly handle UNC paths in salt.utils.path.readlink()
PR #43800: (Ch3LL) Add note to nitrogen release notes about pip for cent6 @ 2017-09-28 17:36:49 UTC
7304907db6 Merge pull request #43800 from Ch3LL/update_7.0
50779c3b1c Add note to nitrogen release notes about pip for cent6
PR #43779: (twangboy) Fix unit.modules.test_state for Windows @ 2017-09-28 14:27:03 UTC
6f687fdcff Merge pull request #43779 from twangboy/win_fix_test_state
a64fe75816 Use os agnostic paths
PR #43782: (twangboy) Fix unit.modules.test_virt for Windows @ 2017-09-28 14:25:16 UTC
db0f569f7a Merge pull request #43782 from twangboy/win_fix_test_virt
7192332758 Fix unit.modules.test_virt for Windows
PR #43723: (nicholasmhughes) Fix ini_manage error and change handling @ 2017-09-28 09:52:09 UTC
dd4fc52f1e Merge pull request #43723 from nicholasmhughes/ini_manage-error-handling
d68c5c4be0 prevent exception when test=True
cfe37916c3 handling changes per section
1c484f6ad5 prevent exception when test=True
PR #43781: (twangboy) Fix unit.modules.test_status for Windows @ 2017-09-28 09:06:19 UTC
5e29507c21 Merge pull request #43781 from twangboy/win_fix_test_status
16ae8253c1 Mock which, use os.linesep for cmd.run return
PR #43785: (twangboy) Fix unit.modules.test_znc for Windows @ 2017-09-28 08:56:11 UTC
05c78ae649 Merge pull request #43785 from twangboy/win_fix_test_znc
7d90721f6b Merge branch '2017.7' into win_fix_test_znc
228e74c8e3 Fix unit.modules.test_znc for Windows
PR #43786: (twangboy) Fix unit.modules.test_zypper for Windows @ 2017-09-28 08:51:59 UTC
10ddb8491c Merge pull request #43786 from twangboy/win_fix_test_zypper
1c05e37a66 Merge branch '2017.7' into win_fix_test_zypper
aafec7ab0e Fix unit.modules.test_zypper for Windows
PR #43773: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-09-28 08:48:39 UTC
9615ca32d5 Merge pull request #43773 from rallytime/merge-2017.7
f7035ed7da Merge branch '2017.7' into merge-2017.7
dfef4a722c Merge branch '2016.11' into '2017.7'
1a8cc60bb4 Merge pull request #43772 from gtmanfred/2016.11
0194c60960 don't print Minion not responding with quiet
9dee896fb9 Merge pull request #43747 from rallytime/gpg-verification
7a70de19f4 Merge branch '2016.11' into gpg-verification
23bb4a5dde Add GPG Verification section to Contributing Docs
PR #43784: (twangboy) Fix unit.modules.test_win_service @ 2017-09-28 03:14:39 UTC
9a9cc69d55 Merge pull request #43784 from twangboy/win_fix_test_win_service
058e50e530 Fix unit.modules.test_win_service
PR #43774: (The-Loeki) typo fix aka what is a 'masterarpi' @ 2017-09-27 18:52:19 UTC
1254da1df5 Merge pull request #43774 from The-Loeki/patch-1
84bbe85e60 typo fix aka what is a 'masterarpi'
PR #43732: (twangboy) Skip unit.stats.test_mac_packages on Windows @ 2017-09-27 14:48:08 UTC
3f888753d4 Merge pull request #43732 from twangboy/win_skip_mac_pkg_tests
1c01e06097 Only skip test on Windows
ec99a3ce3c Fix lint error
61f8a2f7ff Skip mac specific tests
PR #43761: (Ch3LL) Release Notes for 2017.7.2 @ 2017-09-27 14:34:52 UTC
fb86935d99 Merge pull request #43761 from Ch3LL/release_2017.7.2
caf5795856 add mac patch notes
3d5fce0955 Add 2017.7.2 Release Notes
PR #43767: (twangboy) Skip unit.modules.test_snapper on Windows @ 2017-09-27 14:10:27 UTC
5ea603cf16 Merge pull request #43767 from twangboy/win_skip_test_snapper
b41b9c8378 Skip snapper tests on Windows
PR #43759: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-09-27 13:30:38 UTC
77c2c7cbf7 Merge pull request #43759 from rallytime/merge-2017.7
120f49f2c4 Merge branch '2016.11' into '2017.7'
1cc3ad1c8d Merge pull request #43733 from terminalmage/issue43729
6e5c99bda0 Allow docker_events engine to work with newer docker-py
5d38be4ff7 Merge pull request #43458 from terminalmage/issue42082
5f90812b12 Fix missing PER_REMOTE_ONLY in cache.clear_git_lock runner
023a563657 Merge pull request #43727 from rallytime/fix-43650
babad12d83 Revise "Contributing" docs: merge-forwards/release branches explained!
ISSUE #43737: (syedaali) salt.loaded.int.module.boto_kinesis.__virtual__() is wrongly returning None. It should either return True, False or a new name. If you're the developer of the module 'boto_kinesis', please fix this. (refs: #43748)
PR #43748: (rallytime) Add message to boto_kinesis modules if boto libs are missing @ 2017-09-27 13:19:33 UTC
5c203df056 Merge pull request #43748 from rallytime/fix-43737
5a2593dbd3 Add message to boto_kinesis modules if boto libs are missing
PR #43731: (twangboy) Fix unit.beacons.test_status for Windows @ 2017-09-26 16:25:12 UTC
2581098595 Merge pull request #43731 from twangboy/win_unit_beacons_test_status
dc1b36b7e2 Change expected return for Windows
PR #43724: (brejoc) Improved delete_deployment test for kubernetes module @ 2017-09-26 16:19:31 UTC
10f3d47498 Merge pull request #43724 from brejoc/2017.7.kubernetes_delete_test
85b0a8c401 Improved delete_deployment test for kubernetes module
PR #43734: (twangboy) Fix unit.modules.test_poudriere for Windows @ 2017-09-26 14:13:47 UTC
13cc27bdab Merge pull request #43734 from twangboy/win_unit_test_poudriere
922e60fa67 Add os agnostic paths
PR #43742: (terminalmage) Fix incorrect value in docstring @ 2017-09-26 13:55:00 UTC
41aeee7ac8 Merge pull request #43742 from terminalmage/fix-docstring
553335b1c9 Fix incorrect value in docstring
PR #41998: (twangboy) Fix unit.modules.test_environ for Windows @ 2017-09-26 12:25:48 UTC
d78b9a3294 Merge pull request #41998 from twangboy/win_unit_test_environ
d73ef44cf6 Mock with uppercase KEY
048e16883f Use uppercase KEY
PR #42036: (twangboy) Fix unit.modules.test_file for Windows @ 2017-09-26 12:23:10 UTC
7fbbea3806 Merge pull request #42036 from twangboy/win_unit_test_file
056f3bb4c0 Use with to open temp file
352fe69e35 Clarify the purpose of the for loop
b55172d5dc Split by Windows and Linux style line endings
e20aa5c39b Fix line, use os.sep instead of os.linesep
d5f27901e3 Fix additional bytestring issue
716e99c453 Fix py3 bytestring problems
543610570c Fix bytestring issues, fix errored tests
9fe83a34a5 Remove old variable declaration
c5cf5e92c1 Fix many tests
PR #43557: (clan) disable modify yaml constructor @ 2017-09-25 14:03:47 UTC
a81d4b8d8d Merge pull request #43557 from clan/yaml
485471c8a7 Merge branch '2017.7' into yaml
da15658304 remove modify yaml constructor
PR #43566: (damon-atkins) 2017.7 update salt.utils.files.safe_filepath func @ 2017-09-25 13:58:29 UTC
b5beec16e8 Merge pull request #43566 from damon-atkins/2017.7_update_safe_filename_func
c7a652784a remove blank line at end of file
e97651d49b Merge branch '2017.7' into 2017.7_update_safe_filename_func
3b4c1bbf7f Merge branch '2017.7' into 2017.7_update_safe_filename_func
4c88c80ef9 Merge branch '2017.7' into 2017.7_update_safe_filename_func
4171d11838 utils.files.safe_filepath add support to override the os default directory separator
ISSUE #43711: (wedge-jarrad) fcontext_get_policy emits command error if policy doesn't exist (refs: #43712)
PR #43712: (wedge-jarrad) Ignore retcode on call to grep in selinux.py module @ 2017-09-25 13:56:17 UTC
3bb337cf6a Merge pull request #43712 from wedge-jarrad/fix-43711
96c1ef48e6 Ignore retcode on call to grep in selinux.py module
ISSUE #43659: (gaborn57) unable to retrieve pillar data in postgres db (refs: #43716)
PR #43716: (gaborn57) Corrected custom port handling @ 2017-09-25 13:44:58 UTC
5b7411e335 Merge pull request #43716 from gaborn57/2017.7
78137c0860 Corrected custom port handling
PR #43700: (rklaren) Ensure salt-cloud with libvirt provider does not write low level errors to stderr @ 2017-09-25 01:47:25 UTC
PR #43702: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-09-25 01:26:20 UTC
437ac03801 Merge pull request #43702 from rallytime/merge-2017.7
132b1b343b Merge branch '2017.7' into merge-2017.7
ISSUE #38971: (morganwillcock) archive.extracted: lots of unnecessary file transferring, copying, and hashing (refs: #43681, #43518)
PR #43681: (terminalmage) Backport the non-fileclient changes from PR 43518 to 2017.7 @ 2017-09-22 19:27:25 UTC
PR #43518: (terminalmage) Reduce unnecessary file downloading in archive/file states (refs: #43681)
47cd8723c6 Merge pull request #43681 from terminalmage/issue38971-2017.7
91edf865e2 Merge branch '2017.7' into issue38971-2017.7
84f34c93be Backport the non-fileclient changes from PR 43518 to 2017.7
ISSUE #43396: (mkurtak) yumpkg pkg.installed slowed down due to wildcard namig support (refs: #43687)
PR #43687: (mkurtak) yumpkg.py: install calls list_repo_pkgs only if wildcard is used in pkg name @ 2017-09-22 19:23:18 UTC
0a1c5185f5 Merge pull request #43687 from mkurtak/fix-43396
b1e64b11fb yumpkg.py: install calls list_repo_pkgs only if wildcard in pkg name is used
ISSUE #43124: (UtahDave) publisher_acl with regex on username not working and has no documentation (refs: #43467)
PR #43467: (DmitryKuzmenko) Bugs/43124 users regex @ 2017-09-22 19:21:09 UTC
3a79549af4 Merge pull request #43467 from DSRCorporation/bugs/43124_users_regex
14bf2dd8ff Support regex in publisher_acl.
9fe32f8b6e Regex support for user names in external_auth config.
ISSUE #43381: (V3XATI0N) Sharing minion data cache causes false errors in returns (refs: #43670)
PR #43670: (DmitryKuzmenko) Fix for list and contains redis cache logic. @ 2017-09-22 17:56:58 UTC
0e86266b93 Merge pull request #43670 from DSRCorporation/bugs/43381_redis_cache_fix
1c979d5809 Update redis cache contains logic to use more efficient sismember.
039d236948 Fixed list and contains redis cache logic.
6e5cf65d65 Merge branch '2016.11' into '2017.7'
f46c858f25 Merge pull request #43648 from rallytime/handle-boto-vpc-errors
54842b5012 Handle VPC/Subnet ID not found errors in boto_vpc module
PR #43697: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-09-22 17:31:09 UTC
aa47da35dd Merge pull request #43697 from rallytime/merge-2017.7
cbae45bec4 Lint: Remove extra line at end of file
fca4e5563a Merge branch '2016.11' into '2017.7'
9dba34aa06 Merge pull request #43575 from akissa/fix-csr-not-recreated-if-key-changes
b1b4dafd39 Fix CSR not recreated if key changes
1d4fa48209 Merge pull request #43672 from rallytime/bp-43415
3fb42bc238 Fix env_order in state.py
ff832ee607 Merge pull request #43673 from rallytime/bp-43652
d91c47c6f0 Salt Repo has Deb 9 and 8
365cb9fba8 Merge pull request #43677 from terminalmage/runners-docs-2016.11
2fd88e94fa Fix RST headers for runners (2016.11 branch)
be38239e5d Merge pull request #43534 from twangboy/win_fix_pkg.install_2016.11
1546c1ca04 Add posix=False to call to salt.utils.shlex_split
0d3fd3d374 Merge pull request #43661 from moio/2016.11-multiprocessing-doc-fix
625eabb83f multiprocessing minion option: documentation fixes
6b4516c025 Merge pull request #43646 from brejoc/2016.11.4-pidfile-tests
96f39a420b Fixed linting
08fba98735 Fixed several issues with the test
3a089e450f Added tests for pid-file deletion in DaemonMixIn
cfb1625741 Merge pull request #43591 from rallytime/merge-2016.11
57b9d642c2 Merge branch '2016.11.8' into '2016.11'
e83421694f Merge pull request #43550 from twangboy/osx_fix_preinstall_2016.11.8
1b0a4d39d2 Fix logic in /etc/paths.d/salt detection
a648f75949 Merge pull request #43508 from rallytime/bp-43333
d4981a2717 Update doco
a7c8b9e048 Update win_pkg.py
1d6dc6fb72 Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed on the cli (#2)
e7009877bc Merge pull request #43434 from rallytime/2016.11.8-release-notes
68f529ee5e Add 2016.11.8 release notes
8671b91f62 Merge pull request #43572 from vutny/fix-salt-cloud-list-min-instance-set
21966e7ce8 cloud.action: list_nodes_min returns all instances
PR #43314: (twangboy) Fix unit.utils.test_verify for Windows @ 2017-09-21 22:26:13 UTC
e6dc4d64df Merge pull request #43314 from twangboy/win_fix_unit.utils.test_verify
9ada7f626c Merge branch '2017.7' into win_fix_unit.utils.test_verify
c0dc3f73ef Use sys.platform instead of salt.utils to detect Windows
e496d28cbf Fix unit.utils.test_verify for Windows
ISSUE #43599: (vernondcole) Incorrect default for salt.cache.Cache() if opts does not define "cache" (refs: #43680)
PR #43680: (vernondcole) correct default value for salt.cache.Cache @ 2017-09-21 20:09:36 UTC
ec34df2c27 Merge pull request #43680 from vernondcole/fix-salt.cache.Cache-default
292f8c79b8 correct default value for salt.cache.Cache
PR #43530: (twangboy) Fixes removal of double-quotes by shlex_split in winrepo @ 2017-09-21 18:04:48 UTC
99d9d784b1 Merge pull request #43530 from twangboy/win_fix_pkg.install
7f59119f95 Merge branch '2017.7' into win_fix_pkg.install
f146399f7a Use posix=False for shlex.split
PR #43671: (rallytime) [2017.7] Merge forward from 2017.7.2 to 2017.7 @ 2017-09-21 16:39:49 UTC
12b5e62d81 Merge pull request #43671 from rallytime/merge-2017.7
a401166bd5 Merge branch '2017.7.2' into '2017.7'
PR #43676: (terminalmage) Fix RST headers for runners (2017.7 branch) @ 2017-09-21 16:36:21 UTC
e3a2fbc2a3 Merge pull request #43676 from terminalmage/runners-docs-2017.7
9b74634b23 Fix badly-formatted RST in mattermost runner docstring
c0a79c70a4 Fix RST headers for runners (2017.7 branch)
PR #43235: (brejoc) Improve delete_deployment handling @ 2017-09-20 21:33:33 UTC
d02953ce6a Merge pull request #43235 from brejoc/improve-async-operation-handling-in-kubernetes-module
4e8da3045f Fixed logic for windows fallback
3b1cb884b9 Merge branch '2017.7' into improve-async-operation-handling-in-kubernetes-module
d1b5ec098c Merge branch '2017.7' into improve-async-operation-handling-in-kubernetes-module
35cf69bc50 Moved exception Salt core
7431ec64e3 Removed unused sys import
0c71da95f6 Using salt method to identify MS Windows, single instead of double quotes
20619b24c4 Fixed test for delete_deployment
91076bbafa Merge branch '2017.7' into improve-async-operation-handling-in-kubernetes-module
7b600e2832 Added pylint-disable statements and import for salt.ext.six.moves.range
99fe138325 Code styling and added log message for timeout
dcd8d4f639 Merge branch '2017.7' into improve-async-operation-handling-in-kubernetes-module
702a058c38 Fixed linting
3fe623778e Added Windows fallback
52b1cb8147 Compatibility with Python3.6
767af9bb4f Added timeout for checking the deployment
32d7d34fe5 First simple draft for the deletion verification
PR #43554: (twangboy) Win fix chocolatey @ 2017-09-20 16:06:18 UTC
73cb0c27b5 Merge pull request #43554 from twangboy/win_fix_chocolatey
e04acb6216 Merge branch '2017.7' into win_fix_chocolatey
56be5c35eb Improve logic for handling chocolatey states
bcbf7b4e68 Add logic for test=True
ISSUE #43598: (davidvon) Passed invalid arguments to mysql.file_query: unsupported operand type(s) for +=: 'int' and 'tuple' (refs: #43625)
PR #43625: (gtmanfred) results and columns are lists for mysql returns @ 2017-09-20 15:42:59 UTC
ed7eeaaafb Merge pull request #43625 from gtmanfred/2017.7
f84b50a06b results and columns are lists for mysql returns
ISSUE #43560: (smitelli) salt.states.linux_acl requires setfacl/getacl binaries but this is not obvious (refs: #43587, #43580)
PR #43587: (rallytime) Add reason to linux_acl state loading failure @ 2017-09-19 16:26:51 UTC
PR #43580: (garethgreenaway) Updating ACL module and state module documentation (refs: #43587)
1bda4832ef Merge pull request #43587 from rallytime/fix-virtual
e5297e3869 Add reason to linux_acl state loading failure
PR #43584: (cachedout) Enhance engines docs @ 2017-09-18 20:40:57 UTC
2e19533e3c Merge pull request #43584 from cachedout/engines_doc_clarification
634536b0ff Merge branch '2017.7' into engines_doc_clarification
1a619708c1 Enhance engines docs
PR #43519: (terminalmage) Fix incorrect handling of pkg virtual and os_family grain @ 2017-09-18 20:35:01 UTC
50b134ef4c Merge pull request #43519 from terminalmage/fix-aptpkg
0e3c447567 Fix incorrect handling of pkg virtual and os_family grain
PR #43520: (clan) _search_name is '' if acl type is other @ 2017-09-18 20:33:51 UTC
dd953f36ae Merge pull request #43520 from clan/acl
54216177c1 _search_name is '' if acl type is other
PR #43561: (wedge-jarrad) Clean up doc formatting in selinux state & module @ 2017-09-18 20:28:47 UTC
ad9663a7fc Merge pull request #43561 from wedge-jarrad/selinux-doc-cleanup
1bd263cd51 Clean up doc formatting in selinux state & module
ISSUE #43560: (smitelli) salt.states.linux_acl requires setfacl/getacl binaries but this is not obvious (refs: #43587, #43580)
PR #43580: (garethgreenaway) Updating ACL module and state module documentation (refs: #43587) @ 2017-09-18 20:11:26 UTC
cc3d9c1a01 Merge pull request #43580 from garethgreenaway/43560_update_linux_acl_documentation
e63fae4c91 Merge branch '2017.7' into 43560_update_linux_acl_documentation
PR #43523: (skizunov) Add back lost logic for multifunc_ordered @ 2017-09-18 17:46:16 UTC
PR #38168: (skizunov) Add support for a multi-func job using same func more than once (refs: #43523)
bf7b23316f Merge pull request #43523 from skizunov/develop2
fb579321a9 Add back lost logic for multifunc_ordered
117a0ddbbc Updating the documentation to call out the requirement for the getfacl and setfacl binaries
49f25b9f19 Lint
31d17c0124 Fix typo found by @s0undt3ch
5dba74d2cb Fix to module.run [WIP]
ISSUE #43447: (UtahDave) When using Syndic with Multi Master the top level master doesn't reliably get returns from lower minion. (refs: #43526)
PR #43526: (DmitryKuzmenko) Forward events to all masters syndic connected to @ 2017-09-18 16:54:46 UTC
e29efecf4f Merge pull request #43526 from DSRCorporation/bugs/43447_syndic_events_forwarding
64d6109654 Merge branch '2017.7' into bugs/43447_syndic_events_forwarding
3b2a529385 Merge branch '2017.7' into bugs/43447_syndic_events_forwarding
0e4a744d95 Forward events to all masters syndic connected to.
ISSUE #43077: (Manoj2087) Issue with deleting key via wheel (refs: #43330)
PR #43330: (terminalmage) Fix reactor regression + unify reactor config schema @ 2017-09-18 16:46:11 UTC
56b671e087 Merge pull request #43330 from terminalmage/issue43077
a7b4e1f782 Simplify client logic
b85c8510c7 Improve the reactor documentation
20f6f3cc39 Include a better example for reactor in master conf file
4243a2211d Rewrite the reactor unit tests
9db3f5ae6d Unify reactor configuration, fix caller reactors
34b6c3b65f Un-deprecate passing kwargs outside of 'kwarg' param
ISSUE #33793: (mstarostik) states.ssh_auth adds bogus newline before newly added keys (refs: #43483)
PR #43505: (rallytime) Back-port #43483 to 2017.7 @ 2017-09-15 21:22:12 UTC
PR #43483: (3add3287) Handle bogus newline before newly added keys (refs: #43505)
078d5d17de Merge pull request #43505 from rallytime/bp-43483
c68dd5b8a4 Lint: fix spacing
406f61ac9a Fix indentation from tabs to spaces
923ec62771 Copy paste typo
6f6619242f Fix checking for newline on end of file by properly checking the last byte of the file if the file is non empty.
ISSUE #43464: (psagers) acme.cert state: IOError on failure to create a new certificate (refs: #43465)
PR #43491: (rallytime) Back-port #43465 to 2017.7 @ 2017-09-15 18:24:47 UTC
PR #43492: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-09-15 18:23:49 UTC
3620c15c9a Merge pull request #43492 from rallytime/merge-2017.7
4251ce5a27 Merge branch '2016.11' into '2017.7'
f2b86fa2db Merge pull request #43461 from twangboy/win_norestart
2d269d1a76 Change all comment markers to '#'
d80aea16cb Handle ErrorCodes returned by VCRedist installer
fb31e9a530 Add /norestart switch to vcredist install
90e8ca9c36 Merge pull request #43366 from brejoc/2016.11.pidfile-fix
6e3eb76c79 Removed unused format argument
daf4948b3d Catching error when PIDfile cannot be deleted
a6c458607a Merge pull request #43442 from garethgreenaway/43386_2016_11_schedule_kwargs_pub
e637ecbe86 Merge branch '2016.11' into 43386_2016_11_schedule_kwargs_pub
6114df8dc3 Adding a small check to ensure we do not continue to populate kwargs with __pub_ items from the kwargs item.
3c429299f9 Merge pull request #43456 from rallytime/43445_follow_up
35c1d8898d Add Neon to version list
6db7a721c0 Merge pull request #43441 from meaksh/2016.11-salt-bash-completion-fix
be4f26ab21 Use $HOME to get the user home directory instead using '~' char
05fff44a50 Merge pull request #43445 from rallytime/bump-deprecation-warning
c91cd1c6d9 Bump deprecation warning for boto_vpc.describe_route_table
c57dc5f0e3 Merge pull request #43432 from rallytime/bp-43419
c471a29527 make cache dirs when spm starts
ISSUE #43479: (haam3r) Mattermost runner failing to retrieve config values due to unavailable config runner (refs: #43513)
PR #43513: (haam3r) Issue #43479 No runners.config in 2017.7 branch @ 2017-09-15 14:58:27 UTC
ISSUE #42926: (nixjdm) network.system not setting hostname in hosts file, preventing sudo. (refs: #43431)
PR #43431: (mattLLVW) Fix /etc/hosts not being modified when hostname is changed @ 2017-09-13 18:35:55 UTC
c3d9e2d9b2 Merge pull request #43431 from mattLLVW/fix-hosts-deb
c6320b1dff Merge branch '2017.7' into fix-hosts-deb
a3b2e19149 Fix /etc/hosts not being modified when hostname is changed
PR #43403: (twangboy) Proper timestamp conversion in redis.lastsave @ 2017-09-12 21:18:06 UTC
a09f289fbb Merge pull request #43403 from twangboy/win_fix_redismod
f6da23e1aa Properly handle timestamp conversion
PR #43463: (twangboy) Add /norestart switch to vcredist installer @ 2017-09-12 20:29:27 UTC
0eaa5acb72 Merge pull request #43463 from twangboy/win_norestart_2017.7
6984b8fd60 Add /norestart to vcredist installer
ISSUE #43386: (rajvidhimar) Scheduler's job_kwargs not working as expected. (refs: #43443, #43442)
PR #43443: (garethgreenaway) [2017.7] Fixes to scheduler __pub values in kwargs @ 2017-09-12 18:14:46 UTC
2fc237a806 Merge pull request #43443 from garethgreenaway/43386_2017_7_schedule_kwargs_pub
a29a9855a6 Fixing typo.
2681b7d3fa Merge branch '2017.7' into 43386_2017_7_schedule_kwargs_pub
ISSUE #39775: (mirceaulinic) Proxy mine_interval config ignored (refs: #41547)
PR #41547: (mirceaulinic) Override proxy minion opts with pillar data @ 2017-09-11 21:47:51 UTC
5378ac7756 Merge pull request #41547 from cloudflare/px_merge_pillar_opts
aad39ba665 Document the new opts
cdc0d9674a Allow disabling the mines details merge
732b63b0b9 Merge mine details whenever possible
96b31d5643 Override proxy opts with pillar data when required
fd499887f9 Define new proxy merge pillar in opts... opts
abab6fd91c Override minion opts with pillar data
PR #41943: (twangboy) Fix unit.returners.test_local_cache for Windows @ 2017-09-11 21:34:03 UTC
08d102c869 Merge pull request #41943 from twangboy/win_unit_test_local_cache
3777b34572 Merge branch '2017.7' into win_unit_test_local_cache
35b79ecde6 Remove cur variable, use time.time() in comparison
9b61533b09 Get more accurate currnet time in local_cache
844e3f65bc Fix unit tests for Windows
PR #43424: (twangboy) Fix unit.modules.test_hosts for Windows @ 2017-09-11 21:28:41 UTC
50ab79f0cb Merge pull request #43424 from twangboy/win_unit_test_hosts
90dcf8287c Fix unit.modules.test_hosts for Windows
PR #42652: (skizunov) Fix loader.py's raw_mod() to look in all module dirs @ 2017-09-11 19:43:48 UTC
0f0ed5a093 Merge pull request #42652 from skizunov/develop3
d82e406f15 Fix loader.py's raw_mod() to look in all module dirs
PR #43438: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-09-11 18:33:39 UTC
ca091bc8a4 Merge pull request #43438 from rallytime/merge-2017.7
ef7b4242c3 Merge branch '2016.11' into '2017.7'
57cccd75d0 Merge pull request #43390 from aogier/43387-genesis-qemu
496f14a7e7 forgot to mock the proper one
51c7a1ba00 only check if static_qemu is_executable()
70642e495d better qemu_static parameter mangle in deboostrap management, tests
6106aec696 Merge pull request #43356 from gtmanfred/2016.11
3f19b247f3 Add handler.messages back in for test comparison
9911b04208 fix test
3c6ae99a77 never-download got readded
e638fac54e Merge pull request #43325 from doesitblend/salt-mine-doc-fix
1e94d0ac3a Lint: Remove trailing whitespace
51af8f8757 Fix mine_interval phrasing in default file
ba0cdd4536 Fix phrasing for mine_interval description
9ff03c2d43 Update Salt Mine documentation to show that the mine_interval option is configured in minutes.
fc587f784a Merge pull request #43105 from aogier/43086-no-member
5111cf8bad Merge branch '2016.11' into 43086-no-member
d97a680372 Merge pull request #43333 from damon-atkins/2016.11
92de2bb498 Update doco
fc9c61d12e Update win_pkg.py
c91fc14704 Merge branch '2016.11' into 2016.11
cb3af2bbbd Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed on the cli (#2)
42a118ff56 fixed cmd composition and unified his making across module
3fd59ed369 Adding a small check to ensure we do not continue to populate kwargs with __pub_ items from the kwargs item.
PR #43320: (twangboy) Fix unit.modules.test_alternatives for Windows @ 2017-09-11 17:28:00 UTC
a9592dd3e2 Merge pull request #43320 from twangboy/win_fix_alternatives
a909813fa5 Remove unused import (lint)
3ef8d714cb Fix unit tests to mock salt.utils.path.readlink
c0d81aa1ce Use salt.utils.path.readlink
7c4460164b Fix alternatives for Windows
PR #43363: (twangboy) Fix unit.modules.test_ini_manage for Windows @ 2017-09-11 17:10:31 UTC
9b89e49846 Merge pull request #43363 from twangboy/scratch_ini_tests
a94319a082 Make sure formatting of TEST_FILE_CONTENT matches original
6263bc8983 Remove print statement
79cd3831ae Fix empty value preserved test
85997391f1 Is this handled the same on Linux and Windows
PR #43421: (gtmanfred) Revert "Reduce fileclient.get_file latency by merging _file_find and … @ 2017-09-11 17:07:18 UTC
673ce387c1 Merge pull request #43421 from gtmanfred/compat
f85bf8c18f Revert "Reduce fileclient.get_file latency by merging _file_find and _file_hash"
ISSUE #42165: (arount) top_file_merging_strategy: merge does not works (refs: #43415)
PR #43415: (mattLLVW) Fix env_order in state.py (refs: #43672) @ 2017-09-11 15:18:08 UTC
47d982fd37 Merge pull request #43415 from mattLLVW/fix-env-order
f6313a1b2c Merge branch '2017.7' into fix-env-order
e93a962980 Fix env_order in state.py
PR #43422: (twangboy) Fix unit.cloud.clouds.test_ec2 for Windows @ 2017-09-11 15:17:20 UTC
e89e23a32e Merge pull request #43422 from twangboy/win_unit_cloud_ec2
1379627334 Fix unit.cloud.clouds.test_ec2 for Windows
PR #43423: (twangboy) Fix unit.modules.test_gem for Windows @ 2017-09-11 15:15:28 UTC
54f833ac59 Merge pull request #43423 from twangboy/win_unit_test_gem
b2cea18d13 Fix unit.modules.test_gem for Windows
PR #43419: (gtmanfred) make cache dirs when spm starts (refs: #43432) @ 2017-09-11 13:42:50 UTC
b3116109e5 Merge pull request #43419 from gtmanfred/2017.7
58378866e5 make cache dirs when spm starts
PR #43371: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-09-08 15:39:12 UTC
9b27473763 Merge pull request #43371 from rallytime/merge-2017.7
7b07b58396 Merge branch '2016.11' into '2017.7'
0c986f5eba Merge pull request #43361 from rallytime/bp-43329
b09e5b4379 Fix #43295, better handling of consul initialization issues
22287439e6 Merge pull request #42903 from junovitch/issue-35840-fix-preserve-minion-cache-2016.11
c9d4fdbd45 Merge branch '2016.11' into issue-35840-fix-preserve-minion-cache-2016.11
93a68e32a5 Merge branch '2016.11' into issue-35840-fix-preserve-minion-cache-2016.11
079f097985 Fix 'preserve_minion_cache: True' functionality (fixes #35840)
4860e10757 Merge pull request #43360 from terminalmage/sj-496
433bca14b1 Fix KeyError in yumpkg configparser code on Python 3
f6c16935d8 Move --showduplicates before repository-packages
4ba2dbe41e Merge pull request #43244 from rallytime/release-branch-clarifications
0d5a46dbaa Update release branch section with a few more details
1a012eb3d7 Merge pull request #43359 from gtmanfred/ipaddr
23d9abb560 ipaddr_start ipaddr_end for el7
8f88111be8 Merge pull request #43247 from rallytime/mentionbot-backports
2b85757d73 Always notify tkwilliams when changes occur on boto files
40b5a29f90 Add basepi to userBlacklist for mention bot
bad8f56969 Always notify ryan-lane when changes occur on boto files
PR #43398: (twangboy) Fix unit.modules.test_mount for Windows @ 2017-09-08 13:39:29 UTC
97f05ff603 Merge pull request #43398 from twangboy/win_fix_test_mount
4a8d7e522c Fix tests, Use full path to salt.utils.which
PR #43399: (twangboy) Fix unit.modules.test_pam for Windows @ 2017-09-08 13:37:50 UTC
6a4cc5c1b0 Merge pull request #43399 from twangboy/win_fix_test_pam
6257aa964a Fix unit.modules.test_pam for Windows
PR #43400: (twangboy) Fix unit.modules.test_parted for Windows @ 2017-09-08 13:37:00 UTC
2b5cfae3f8 Merge pull request #43400 from twangboy/win_unit_test_parted
8e3e897ee2 Fix unit.modules.test_parted for Windows
PR #43401: (twangboy) Fix unit.modules.test_pw_group for Windows @ 2017-09-08 13:35:45 UTC
332deeb013 Merge pull request #43401 from twangboy/win_unit_test_pw_group
78e39a1b9d Fix unit.modules.test_pw_group for Windows
PR #43402: (twangboy) Fix unit.modules.test_qemu_nbd for Windows @ 2017-09-08 13:34:58 UTC
c0f54bfef1 Merge pull request #43402 from twangboy/win_unit_test_qemu_nbd
531ce8022b Fix unit.modules.test_qemu_nbd for Windows
PR #43404: (twangboy) Fix unit.modules.test_seed for Windows @ 2017-09-08 13:32:41 UTC
be88fbb45f Merge pull request #43404 from twangboy/win_unit_test_seed
6ceb895a84 Use os.path.join for paths
PR #43301: (twangboy) Fix unit.test_spm for Windows @ 2017-09-08 13:24:35 UTC
612c6a8756 Merge pull request #43301 from twangboy/win_fix_unit_test_spm
8608a6b303 Merge branch '2017.7' into win_fix_unit_test_spm
b8da04c04d Add Mike's changes
f36efbd6a7 Fix unit.test_spm for Windows
PR #43372: (skizunov) Fix system.set_system_time when no hw clock is present @ 2017-09-07 17:45:33 UTC
f959113694 Merge pull request #43372 from skizunov/develop5
281e471853 Fix system.set_system_time when no hw clock is present
PR #43193: (jettero) Prevent spurious "Template does not exist" error @ 2017-09-06 20:16:58 UTC
ISSUE #42706: (blarghmatey) Parallel Cache Failure (refs: #43018, #43159)
PR #43159: (jubrad) Bp 43018 @ 2017-09-05 22:29:16 UTC
PR #43056: (damon-atkins) safe_filename_leaf(file_basename) and safe_filepath(file_path_name) (refs: #43159, #43172)
015cbc57d9 Merge pull request #43159 from jubrad/bp-43018
25419a56db Merge branch '2017.7' into bp-43018
971b4c0890 Merge branch '2017.7' into bp-43018
4f8e6c65e5 access safe_filename_leaf through utils.files, changed in #43172
42064883ea state.py remove unused urllib import
4957268b37 update state.py to use safe_filename_leaf
b8ead879ed Fixing lint issues
446457d017 Swapping from for import
fb80e17400 state.py: fix import and utf8 encode before quote
1dcf167bb7 Update state.py
PR #43232: (terminalmage) Improve inheritance in salt.utils.gitfs @ 2017-09-05 20:37:06 UTC
6e1b541b46 Merge pull request #43232 from terminalmage/gitfs-inheritance
53bd3a3e23 Improve inheritance in salt.utils.gitfs
PR #43238: (s0undt3ch) Include the line number by default on the log file format @ 2017-09-05 20:31:54 UTC
086b220091 Merge pull request #43238 from s0undt3ch/2017.7
630a1db3ab Include the line number by default on the log file format
PR #43294: (twangboy) Win build scripts @ 2017-09-05 20:12:54 UTC
09dc58cde5 Merge pull request #43294 from twangboy/win_build_scripts
9979ccb613 Remove Py2 and Py3 in the same run
a5d9f85db6 Modifications to build scripts
PR #43322: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-09-05 18:21:26 UTC
21ab306ef4 Merge pull request #43322 from rallytime/merge-2017.7
b1062f8c15 Merge branch '2016.11' into '2017.7'
02867fdcd2 Merge pull request #43277 from rallytime/owners-file
2b4da0f0e7 Add CODEOWNERS file
1c1c484479 Merge pull request #43312 from lordcirth/fix-cron-docs
ec94a13750 cron docs: Remind user to use quotes for special strings
0d1ed4b750 Merge pull request #43290 from lordcirth/fix-file-path-docs
14a4591854 file.py docs: correct group and mode
d4214ca283 file.py docs: specify absolute paths
26ff89539e Merge pull request #43274 from terminalmage/fix-int-types
d533877743 Use six.integer_types instead of int
cf21f91fb2 Merge pull request #43271 from twangboy/win_fix_pkg.install
91b062f564 Fix formatting issue, spaces surrounding +
PR #43324: (twangboy) Fix unit.modules.test_chef for Windows @ 2017-09-05 16:40:11 UTC
62429c547d Merge pull request #43324 from twangboy/fix_unit.modules.test_chef
5bd5ea042a Fix unit.modules.test_chef for Windows
PR #43268: (rallytime) Back-port #43237 to 2017.7 @ 2017-09-01 18:17:13 UTC
PR #43270: (rallytime) [2017.7] Merge forward from 2016.11 to 2017.7 @ 2017-09-01 18:09:46 UTC
02504dd363 Merge pull request #43270 from rallytime/merge-2017.7
f8b025f6dc Merge branch '2016.11' into '2017.7'
3a0b02f3ae Merge pull request #43228 from twangboy/win_fix_pkg.install
13dfabb1ce Fix regex statement, add .
31ff69f0ad Add underscore to regex search
3cf2b6575c Fix spelling
ed030a35a5 Use regex to detect salt-minion install
e5daff495a Fix pkg.install
b4c689dff5 Merge pull request #43191 from viktorkrivak/fix-apache-config-multi-entity
c15bcbe1cc Merge remote-tracking branch 'upstream/2016.11' into fix-apache-config-multi-entity
4164047951 Fix apache.config with multiple statement At this moment when you post more than one statement in config only last is used. Also file is rewritten multiple times until last statement is written. Example: salt '*' apache.config /etc/httpd/conf.d/ports.conf config="[{'Listen': '8080'}, {'Proxy': "Something"}]" Ends only with Proxy Something and ignore Listen 8080, This patch fix this issue.
b90e59ede9 Merge pull request #43154 from lomeroe/bp-43116-2016.11
8f593b0b02 verify that files exist before trying to remove them, win_file.remove raises an exception if the file does not exist
33a30bac06 correcting bad format statement in search for policy to be disabled
acc3d7ac82 correct fopen calls from salt.utils for 2016.11's utils function
2da1cdd109 lint fix
61bd12c0de track xml namespace to ensure policies w/duplicate IDs or Names do not conflict
f232bed9f9 add additional checks for ADM policies that have the same ADMX policy ID (#42279)
ISSUE #42459: (iavael) Broken ldap groups retrieval in salt.auth.ldap after upgrade to 2017.7 (refs: #43283)
PR #43283: (DmitryKuzmenko) Fix ldap token groups auth. @ 2017-09-01 17:49:46 UTC
ece0e393ef Merge pull request #43283 from DSRCorporation/bugs/42459_broken_ldap_groups
3ad6911210 Fix for tests: don't require 'groups' in the eauth token.
1f104cf85b Fix ldap token groups auth.
PR #43149: (BenoitKnecht) Fix iptables.get_rules when rules contain --nfmask or --ctmask @ 2017-09-01 15:57:05 UTC
4f023c4cb6 Merge pull request #43149 from BenoitKnecht/2017.7.1
3c1ddc9bde modules: iptables: correctly parse --nfmask/--ctmask
ISSUE #43258: (nomeelnoj) metadata_server_grains problems (refs: #43265)
PR #43265: (gtmanfred) make sure meta-data grains work on ec2 @ 2017-09-01 15:31:12 UTC
cf2b75bb86 Merge pull request #43265 from gtmanfred/2017.7
04dd8ebedb make sure meta-data grains work on ec2
PR #43299: (twangboy) Fix unit.netapi.rest_cherrypy.test_tools for Windows @ 2017-09-01 15:13:43 UTC
618b221895 Merge pull request #43299 from twangboy/win_fix_netapi_cherrypy
fd74acb603 Merge branch '2017.7' into win_fix_netapi_cherrypy
PR #43300: (twangboy) Fix unit.netapi.rest_tornado.test_handlers for Windows @ 2017-09-01 13:10:11 UTC
aee654da92 Merge pull request #43300 from twangboy/win_fix_netapi_rest_tornado
c93d2ed386 Use os.sep instead of '/'
3fbf24b91a Use os.sep instead of '/'
ISSUE #43259: (mahesh21) NameError: global name '__opts__' is not defined (refs: #43266)
PR #43278: (gtmanfred) bootstrap can come from dunders @ 2017-08-31 13:31:20 UTC
PR #42975: (brejoc) Added unit tests for Kubernetes module @ 2017-08-30 20:30:16 UTC
479e0e06ac Merge pull request #42975 from brejoc/tests-for-kubernetes-module
fdad9177b5 Merge branch '2017.7' into tests-for-kubernetes-module
c227cb25ad Skipping test on ImportError
bd76a870ce Dunder vars are now defined via setup_loader_modules
3c99e61637 Renamed test to match new convention
caf78d206d Fixed imports for pytest
c8e98c8d8a Added unit tests for Kubernetes module
ISSUE #42935: (BenjaminSchubert) docker_image.present always ends up failing even on correct result. (refs: #43176)
PR #43176: (terminalmage) docker_image states: Handle Hub images prefixed with "docker.io/" @ 2017-08-30 20:08:13 UTC
ca7df1d4cf Merge pull request #43176 from terminalmage/issue42935
df18a89836 Lint: Remove unused import
7279f98e92 docker_image states: Handle Hub images prefixed with "docker.io/"
f7c945f6e4 Prevent spurious "Template does not exist" error
