2015-10-13
Version 2015.5.6 is a bugfix release for 2015.5.0.
Total Merges: 145
Total Issue References: 71
Total PR References: 178
Contributors: 53 (Arabus, JensRantil, PierreR, SaltyCharles, TheBigBear, abh, aboe76, anlutro, arthurlogilab, aspyatkin, basepi, benhosmer, bersace, cachedout, carlpett, damonzheng, derphilipp, dmyerscough, dsumsky, efficks, eguven, garethgreenaway, hexedpackets, jacksontj, jacobhammons, jfindlay, joejulian, johanek, julianbrost, kev009, lorengordon, madprog, marccardinal, netroby, nmadhok, plastikos, rallytime, serge-p, spudfkc, stanislavb, styro, systembell, tankywoo, techhat, terminalmage, thatch45, tjstansell, twangboy, vakulich, vtek21, whiteinge, zmalone, zyio)
CVE-2015-6941 The Windows user
module and
salt-cloud
display passwords in log when log level is set to debug
or more verbose.
For the Windows user
module, the password is
now replaced with the string XXX-REDACTED-XXX
.
For salt-cloud, debug logging no longer displays win_password
and
sudo_password
authentication credentials.
CVE-2015-6918 Git state/execution modules log HTTPS auth credentials when
log level is set to debug
or more verbose.
These credentials are now replaced with REDACTED
in the debug output.
Thanks to Andreas Stieger <asteiger@suse.com> for bringing this to our
attention.
Generated at: 2018-05-27 22:13:00 UTC
PR #27582: (jfindlay) add 2015.5.6 release notes @ 2015-09-30 22:33:48 UTC
304dc68f7f Merge pull request #27582 from jfindlay/2015.5
4f0d55cda6 add 2015.5.6 release notes
ISSUE #27518: (srkunze) [Docs] Relationship between Mine and Grains (refs: #27557)
PR #27557: (jfindlay) add doc motivating mine vs grains @ 2015-09-30 17:49:46 UTC
7201ce71e4 Merge pull request #27557 from jfindlay/mine_doc
3727d79bad edit mine doc for style and markup
7e037a4666 add doc motivating mine vs grains
ISSUE #27478: (rominf) iptables state fails to save rules (refs: #27515)
PR #27515: (jfindlay) save iptables rules on SuSE @ 2015-09-30 16:09:42 UTC
59c3d5f93e Merge pull request #27515 from jfindlay/suse_fire
4460ad2785 save iptables rules on SuSE
ISSUE #27460: (llevar) Orchestrate runner not resolving reference to a built in state (refs: #27509)
PR #27509: (jfindlay) tell the user why the gluster module does not work @ 2015-09-30 15:49:16 UTC
9b26357b19 Merge pull request #27509 from jfindlay/gluster_reason
1ccda538d2 tell the user why the gluster module does not work
ISSUE #27372: (GregMeno) pip.installed state fails when env_vars is not a dict (refs: #27379)
PR #27379: (jfindlay) document and check dict type for pip env_vars @ 2015-09-30 02:56:52 UTC
989733ea86 Merge pull request #27379 from jfindlay/pip_vars
aee51ffdef document and check dict type for pip env_vars
PR #27516: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-09-29 17:53:33 UTC
6d773f66c3 Merge pull request #27516 from basepi/merge-forward-2015.5
a08951f0fa Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
5262f01325 Merge pull request #27335 from rallytime/cloud-logging-7
adeb1dcad4 Pylint Fix
588c13783c Salt-cloud logging clean up for windows functions
9b6000135c [2014.7] Fixup salt-cloud logging
ISSUE #27447: (junster1) Fix mysql table size for salt_events (refs: #27472)
PR #27472: (cachedout) Change recommeded schema for data field in mysql event table @ 2015-09-29 15:49:37 UTC
68d784c3dd Merge pull request #27472 from cachedout/fix_27447
5e745ad6da Change recommeded schema for data field in mysql event table
PR #27468: (cachedout) Fix 27351 @ 2015-09-29 15:35:29 UTC
PR #27351: (SaltyCharles) fix sysctl truncating newline on os x (refs: #27468)
ee6e0ed057 Merge pull request #27468 from cachedout/fix_27351
0bc37c0d41 Fix test
f9a19720de fix sysctl truncating newline on os x
ISSUE #27438: (aboe76) can't set system locale on OpenSuse SUse (refs: #27479)
PR #27479: (aboe76) fix locale on opensuse and suse #27438 @ 2015-09-29 15:34:48 UTC
ISSUE #17103: (arthurlogilab) salt is looking for outputters in /var/cache/salt/minion/extmods/output not /var/cache/salt/minion/extmods/outputputters (refs: #27483)
PR #27483: (rallytime) Outputters should sync to output, not outputters, on the minion. @ 2015-09-29 15:33:08 UTC
931f593b51 Merge pull request #27483 from rallytime/fix-17103
441241eb90 Change sync_outputters to sync_output for consistency, but alias sync_outputters
105528720b Outputters should sync to output, not outputters, on the minion.
PR #27484: (rallytime) Back-port #27434 and #27470 to 2015.5 @ 2015-09-29 15:32:03 UTC
ISSUE #27433: (TheBigBear) winrepo - drops "trailing zeroes" from version numbers on un-install? (refs: #27469)
PR #27469: (twangboy) Added quotes to version numbers example @ 2015-09-28 21:54:43 UTC
927874d316 Merge pull request #27469 from twangboy/fix_27433
a996ea46e2 Added quotes to version numbers example
ISSUE #27342: (ariscn) File.managed silent fail for contents_pillar (refs: #27375, #27467)
PR #27467: (cachedout) file.managed: check contents_{pillar|grain} result @ 2015-09-28 20:22:16 UTC
ISSUE #9856: (jeremyBass) for grant in grants: TypeError: 'bool' object is not iterable (refs: #27419)
PR #27419: (rallytime) Amend error log to include multiple tips for troubleshooting. @ 2015-09-28 17:53:19 UTC
ed6207a438 Merge pull request #27419 from rallytime/fix-9856
551396564a Ammend error log to include multiple tips for troubleshooting.
ISSUE #16753: (johtso) Duplicate selector in top file gives unhelpful traceback (refs: #27426)
PR #27426: (rallytime) Don't stacktrace if there are conflicting id errors in highstate @ 2015-09-28 14:52:51 UTC
73fa89edf7 Merge pull request #27426 from rallytime/fix-16753
f6cbd81e66 Don't stacktrace if there are conflicting id errors in highstate
ISSUE #27406: (s-iraheta) salt-cloud error with Softlayer (Bare Metal Instance): TypeError: 'bool' object is not iterable and with --list-locations: Failed to get the output of 'softlayer_hw.avail_locations()': 142776 (refs: #27408)
PR #27408: (rallytime) Fix avail_locations function for the softlayer_hw driver in 2015.5 @ 2015-09-25 23:34:50 UTC
5dd1b70475 Merge pull request #27408 from rallytime/fix-27406-for-2015.5
39a4ae5a6c Remove hdd: 19 refs from SL docs - no longer available from SoftLayer.
de2f9234d3 Use correct default for bandwith
42d8127f79 Don't set the optional_products default to a boolean, and then try to loop.
9d8a3d8303 Fix avail_locations function for the softlayer_hw driver in 2015.5
PR #27410: (jacobhammons) Fix css layout Refs #27389 @ 2015-09-25 22:38:48 UTC
PR #27336: (rallytime) [2015.5] Fixup salt-cloud logging @ 2015-09-24 15:02:52 UTC
3746085587 Merge pull request #27336 from rallytime/cloud-logging-five
7956b36076 [2015.5] Fixup salt-cloud logging
ISSUE #27356: (lorengordon) file.replace fails if repl contains special regex characters and append_if_not_found=True (refs: #27358)
PR #27358: (lorengordon) Escape search replacement text, fixes #27356 @ 2015-09-24 13:52:46 UTC
ISSUE #19236: (bramhg) salt-cloud : Unable to add SSD disk and unable to auto-delete disk on instance termination on GCE (refs: #27345)
PR #27345: (rallytime) Allow use of rst header links by separating options out from yaml example @ 2015-09-23 19:48:56 UTC
6759f79d6d Merge pull request #27345 from rallytime/docs-for-19236
1d3925bbfb Added version tag for ex_disk_type option
f23369300c Allow use of rst header links by separating options out from yaml example
PR #26903: (bersace) Review defaults.get @ 2015-09-23 14:52:20 UTC
c2efb291e2 Merge pull request #26903 from bersace/fix-defaults-modules
474d7afc95 fixup! Review defaults loading
36141d226e fixup! Review defaults loading
62b6495358 fixup! Review defaults loading
cf0624e8b8 fixup! Review defaults loading
2c58bab977 fixup! Review defaults loading
82c5b1d8fd Review defaults loading
ISSUE #27316: (efficks) Extracted state with zip format failed on Windows (refs: #27317)
PR #27317: (efficks) State unzip should use unzip command instead of unzip_cmd. @ 2015-09-23 14:41:36 UTC
ISSUE #15514: (flyaruu) Calling a boto_route53.present state fails if the record is already there (refs: #27309)
PR #27309: (rallytime) Change a value list to a comma-separated string in boto_route53.present @ 2015-09-23 14:30:50 UTC
bd3771e80f Merge pull request #27309 from rallytime/fix-15514
9383d91ff8 Change a value list to a comma-separated string in boto_route53.present
ISSUE #27297: (JensRantil) file.replace documentation improvement (refs: #27311)
PR #27311: (jfindlay) discuss replacement occurrences in file doc @ 2015-09-22 22:23:10 UTC
b5fe944875 Merge pull request #27311 from jfindlay/maxoc
8ec2e921bd discuss replacement occurrences in file doc
PR #27310: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-09-22 21:08:41 UTC
ISSUE #27307: (terminalmage) Regression in yumpkg's refresh_db function (refs: #27308)
PR #27308: (terminalmage) Fix refresh_db regression in yumpkg.py @ 2015-09-22 21:07:28 UTC
982c21c79f Merge pull request #27308 from terminalmage/fix-refresh_db-regression
77686fb7ce Fix refresh_db regression in yumpkg.py
PR #27286: (terminalmage) Add a configurable timer for minion return retries @ 2015-09-22 16:35:07 UTC
775a4f9ad0 Merge pull request #27286 from terminalmage/return_retry_timer
540a7dfcf1 Add default values for new minion config options
453b883820 Add a configurable timer for minion return retries
PR #27278: (rallytime) Back-port #27256 to 2015.5 @ 2015-09-21 19:27:51 UTC
PR #27256: (julianbrost) Fix error handling in salt.modules.file.statvfs (refs: #27278)
02482c0572 Merge pull request #27278 from rallytime/bp-27256
1beddf6311 Fix error handling in salt.modules.file.statvfs
PR #27277: (rallytime) Back-port #27230 to 2015.5 @ 2015-09-21 19:06:14 UTC
PR #27253: (jfindlay) 2015.5 -> 2015.5.0 @ 2015-09-18 23:44:43 UTC
b22286476e Merge pull request #27253 from jfindlay/version.2015.5
967e3bb72a 2015.5 -> 2015.5.0
PR #27244: (garethgreenaway) Exception in cloud.ec2.create_snapshot @ 2015-09-18 21:41:11 UTC
51a0193b54 Merge pull request #27244 from garethgreenaway/ec2_create_snapshot_no_return_data_exception
820fd576b9 Fixing the cause when the r_data from aws.query is empty and an exception happens when looking for the snapshotID
ISSUE #27215: (wfhu) cron.file override the crontab file even if there's no change (refs: #27231)
PR #27231: (jfindlay) only write cron file if it is changed @ 2015-09-18 18:23:10 UTC
26540f15bc Merge pull request #27231 from jfindlay/cronchange
1e335297e2 only write cron file if it is changed
PR #27233: (basepi) [2015.5] Add stub release notes for 2015.5.6 @ 2015-09-18 16:55:40 UTC
579f375f74 Merge pull request #27233 from basepi/release.notes.stubs
f4563ea9b7 Add stub release notes for 2015.5.6
ISSUE #25423: (tweenk) Impossible to define a file.managed for use only as a template in "use" requisites (refs: #27208)
PR #27208: (basepi) [2015.5] Add test.nop state @ 2015-09-18 16:50:17 UTC
f5a322e3f2 Merge pull request #27208 from basepi/nop.state.25423
9414b05b2c Add test.nop example
a84ce67b8f Add test.nop state
ISSUE #27187: (SeverinLeonhardt) ssh_known_hosts.present hashes other entries even with hash_hostname: false (refs: #27201)
PR #27201: (jfindlay) rename hash_hostname to hash_known_hosts @ 2015-09-18 15:45:03 UTC
59a07cae68 Merge pull request #27201 from jfindlay/sshhash
1b620b77cd rename hash_host arg to hash_known_hosts
12f14ae37c update hash_known_hosts docs in ssh module
PR #27214: (jacksontj) Correctly support https, port 443 is not a requirement @ 2015-09-18 15:43:05 UTC
560545c4c5 Merge pull request #27214 from jacksontj/2015.5
e7526bdb44 Correctly support https, port 443 is not a requirement
ISSUE #18582: (mainframe) Allow merging file_roots and pillar_roots from different config files included from master.d (refs: #27150)
PR #27172: (rallytime) Back-port #27150 to 2015.5 @ 2015-09-17 17:25:51 UTC
PR #27194: (rallytime) Back-port #27180 to 2015.5 @ 2015-09-17 16:17:24 UTC
PR #27176: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-09-17 15:00:40 UTC
a02d043309 Merge pull request #27176 from basepi/merge-forward-2015.5
66f4641be3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
c186e51764 Merge pull request #27117 from jacobhammons/release-docs-2014.7
b69e11e0a4 made 2014.7 an archived release minor doc site updates
69d758ee2b Merge pull request #27114 from cachedout/warn_on_insecure_log
507fb04683 Issue warning that some log levels may contain sensitive data
aa71bae8aa Merge pull request #27075 from twangboy/fix_password_2014.7
c0689e3215 Replaced password with redacted when displayed
PR #27170: (rallytime) Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples @ 2015-09-16 22:23:51 UTC
de2027426e Merge pull request #27170 from rallytime/gce-docs
a07db909bd Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples
PR #27167: (rallytime) Back-port #27148 to 2015.5 @ 2015-09-16 19:56:01 UTC
PR #27148: (hexedpackets) Pass file pointers to the serialize load functions. (refs: #27167)
28cfdfd067 Merge pull request #27167 from rallytime/bp-27148
d12be52355 Pass filepointers to the serialize load functions.
ISSUE #27157: (alxbse) salt.util.smb loads even when impacket library is missing (refs: #27168)
PR #27168: (techhat) Add further gating of impacket library @ 2015-09-16 18:55:56 UTC
4495f4f4d0 Merge pull request #27168 from techhat/gateimpacket
cc448bfdc1 Add further gating of impacket library
ISSUE #27100: (hexedpackets) salt-cloud --full-query does nothing when no VM profiles are configured (refs: #27166)
PR #27166: (rallytime) Allow a full-query for EC2, even if there are no profiles defined @ 2015-09-16 17:41:40 UTC
3e5ef0dc30 Merge pull request #27166 from rallytime/fix-27100
50fb3a489a Allow a full-query for EC2, even if there are no profiles defined
PR #27162: (rallytime) Be explicit in using "SoftLayer" for service queries in SoftLayer drivers @ 2015-09-16 16:43:26 UTC
f1c9de7ed9 Merge pull request #27162 from rallytime/softlayer-service
d281068c70 Be explicit in using "SoftLayer" for service queries in SoftLayer drivers
ISSUE #27133: (deniswal) win_path.add causes the value data to be set as the value and vice versa (refs: #27149)
PR #27149: (twangboy) Fixed problem with add/remove path @ 2015-09-16 15:01:48 UTC
59e9dfd8de Merge pull request #27149 from twangboy/fix_27133
7992b7e20a Fixed some tests... hopefully...
d4c8e30f5d Fixed problem with add/remove path
ISSUE #11669: (jcockhren) salt.cloud is out of date for new google compute engine dashboard and API (refs: #27147)
PR #27147: (rallytime) Enforce bounds in the GCE Regex @ 2015-09-15 21:51:55 UTC
097fcd1017 Merge pull request #27147 from rallytime/fix-11669
55312ea03f Provide a more friendly error message.
36555856c7 Enforce bounds in the GCE Regex
PR #27128: (eguven) don't show diff for test run if show_diff=False @ 2015-09-15 14:11:55 UTC
f5c3f157dd Merge pull request #27128 from eguven/2015.5-fix-test-diff
ec2d68a84a don't show diff for test run if show_diff=False
PR #27116: (jacobhammons) Update latest to 2015.8, 2015.5 is now previous @ 2015-09-15 07:34:28 UTC
088b1dbb3e Merge pull request #27116 from jacobhammons/release-docs-2015.5
6e323b6dd3 Update latest to 2015.8, 2015.5 is now previous Assorted style and minor updates
ISSUE #25352: (m03) reg.absent reporting incorrect results (refs: #27019)
PR #27033: (jfindlay) Merge #27019 @ 2015-09-15 07:32:17 UTC
ISSUE #17088: (umireon) state.dockerio.run: docked_onlyif and docked_unless do not work (refs: #26942)
PR #26942: (Arabus) Fix docker.run @ 2015-09-14 18:10:54 UTC
35fc74132a Merge pull request #26942 from Arabus/fix-docker.run
e61e1de1f5 Fixes value typo for dockerio.loaded state
39fa11b696 further linting
4aec37397c Further Linting to quiet the linter
7eff8ad070 Code Linting and cmd call fix
a51676e0eb Fixes #17088 olyif and unless should run on the host
d0c6128b8f Fixes #17088 retcode now returns True or False based on return status
8b2e7cc4f5 Syntax clarification
PR #26977: (abh) Add support for PEERNTP network interface configuration @ 2015-09-14 17:59:00 UTC
59f2a0c7ae Merge pull request #26977 from abh/2015.5-ntppeer
df3d6e817f Add support for PEERNTP network interface configuration on RH derived systems
ISSUE #27021: (SEJeff) webutil.user_exists state does not respect test=true (refs: #27023)
ISSUE #21533: (aspyatkin) Add option specifying user to run htpasswd module functions (refs: #21649)
PR #27023: (jfindlay) add test support for htpasswd state mod @ 2015-09-14 17:48:00 UTC
PR #27074: (twangboy) Replaced password with redacted when displayed @ 2015-09-14 16:27:26 UTC
9f999c0027 Merge pull request #27074 from twangboy/fix_password_2015.5
fdd3537456 Replaced password with redacted when displayed
PR #27073: (rallytime) Remove "use develop branch" warning from LXC tutorial @ 2015-09-11 23:51:06 UTC
46b44f85ed Merge pull request #27073 from rallytime/remove-lxc-warning
76c056d02b Remove "use develop branch" warning from LXC tutorial now that 2015.5.0 has been released
PR #27054: (rallytime) Back-port #27029 to 2015.5 @ 2015-09-11 22:29:45 UTC
PR #27053: (rallytime) Back-port #26992 to 2015.5 @ 2015-09-11 22:29:30 UTC
PR #27052: (rallytime) Back-port #26930 to 2015.5 @ 2015-09-11 22:28:11 UTC
PR #27049: (johanek) Run repoquery less @ 2015-09-11 22:26:12 UTC
8b554dd16f Merge pull request #27049 from johanek/repoquery-dedupe
c113916a23 When running repoquery to check for available versions of packages, run once for all packages rather than once per package
PR #27070: (stanislavb) Deprecate salt.utils.iam in Carbon @ 2015-09-11 22:01:57 UTC
PR #26561: (stanislavb) Leave salt.utils.s3 location fallback to salt.utils.aws (refs: #27070)
PR #26446: (stanislavb) Fetch AWS region from EC2 instance metadata (refs: #26561)
PR #26378: (stanislavb) Fix EC2 credentials from IAM roles for s3fs and s3 ext_pillar in 2015.5 (refs: #26446)
cc2cbf9869 Merge pull request #27070 from stanislavb/2015.5
1e6e5ddc9c Deprecate salt.utils.iam in Carbon
PR #27030: (jfindlay) Backport #26938 @ 2015-09-11 15:10:46 UTC
PR #27004: (vtek21) Fix 'dict' object has no attribute split (refs: #27024, #27030)
PR #26938: (derphilipp) Fixes win_path module, migrates from reg.(set|get)_key to reg.(set|get)_value (refs: #27030)
e23caa8ccf Merge pull request #27030 from jfindlay/winreg
120fbe78e0 remove trailing line in win_path exec module
b36a7107b2 update win_path exec module unit tests
a2dc6f2dd7 Fixes win_path module, migrates from reg.(set|get)_key to reg.(set|get)_value
ISSUE #25581: (b18) Salt 2015.5.2 - Could not deserialize msgpack message error. (refs: #27025)
PR #27025: (cachedout) Better try and error handling for prep_jid @ 2015-09-11 07:40:10 UTC
843c28b435 Merge pull request #27025 from cachedout/issue_25581
ecc09d9b93 Lint
bfcaab9ef4 Better try and error handling for prep_jid
PR #27035: (terminalmage) useradd.py: Use contextmanager to prevent leaked filehandles @ 2015-09-11 07:39:41 UTC
b9baa0b39a Merge pull request #27035 from terminalmage/useradd-contextmanager
e430e97f6c Update user states to reflect changes to login class handling
f24b979c7c useradd.py: Use contextmanager to prevent leaked filehandles
PR #27034: (rallytime) Update softlayer docs for where to find apikey @ 2015-09-10 22:29:56 UTC
1cdfdf7a92 Merge pull request #27034 from rallytime/softlayer-doc-fix
cb641f8145 Update softlayer docs for where to find apikey
PR #27024: (rallytime) Back-port #27004 to 2015.5 @ 2015-09-10 21:14:21 UTC
PR #27004: (vtek21) Fix 'dict' object has no attribute split (refs: #27024, #27030)
9e06d3f01a Merge pull request #27024 from rallytime/bp-27004
54d6fcf4c7 Fix 'dict' object has no attribute split
bb29d73c71 Fix 'dict' object has no attribute split
5f1a9c46aa Fix 'dict' object has no attribute split
2bfdd9724e Fix 'dict' object has no attribute split
PR #27027: (rallytime) Back-port #27013 to 2015.5 @ 2015-09-10 21:13:52 UTC
PR #27026: (rallytime) Back-port #27011 to 2015.5 @ 2015-09-10 21:13:45 UTC
ISSUE #20522: (eliasp) modules.win_pkg.install() blindly trusts fileclient.get_url()/unhandled exceptions (refs: #26972)
PR #26972: (twangboy) Catch the 404 error from fileclient @ 2015-09-10 20:53:12 UTC
e8cdcc62f7 Merge pull request #26972 from twangboy/fix_20522
0110786fa9 Catch the 404 error from fileclient
PR #26951: (terminalmage) Fix timezone module for CentOS @ 2015-09-10 20:46:07 UTC
fbc95f4685 Merge pull request #26951 from terminalmage/fix-timezone
30a4915762 Update tests to reflect changes to timezone module
b6f926919f Fix timezone module for CentOS
PR #26875: (marccardinal) LXC gateway provisioned only when IP is provided @ 2015-09-10 19:31:32 UTC
f2ad3c333c Merge pull request #26875 from marccardinal/patch-2
36d5a62262 LXC gateway provisioned only when IP is provided
ISSUE #26730: (styro) __opts__['user'] on Windows minion incorrect (eg for file.symlink) (refs: #26997, #`saltstack/salt`#26899`_`_, #26899)
PR #26997: (twangboy) Fixed symlinks for windows (don't use user root) @ 2015-09-10 18:54:50 UTC
PR #27001: (twangboy) Added CLI Example for reg.delete_key_recursive @ 2015-09-10 17:19:43 UTC
5389a85894 Merge pull request #27001 from twangboy/fix_reg_docs
2980bbda17 Minor clarification
4684b2ddd1 Added CLI example for reg.delete_key_recursive
PR #26996: (jacobhammons) Beacon doc updates @ 2015-09-10 16:47:49 UTC
37814f5dff Merge pull request #26996 from jacobhammons/beacon-doc
e475ea688e Fixed typo
2401533d9e New content added to beacon docs.
ISSUE #26867: (joejulian) lvm pv's can show as not belonging to their vg if symlink is used (refs: #26868)
PR #26868: (joejulian) Use the actual device name when checking vgdisplay @ 2015-09-10 16:08:16 UTC
4ba7eed711 Merge pull request #26868 from joejulian/2015.5_lvm_vg_symlink_fix
3dfb33849a Use the actual device name when checking vgdisplay
PR #26955: (dsumsky) S3 ext_pillar module has broken caching mechanism (backport to 2015.5) @ 2015-09-10 14:54:01 UTC
1537e945be Merge pull request #26955 from dsumsky/s3-pillar-module-cache-fix-2015.5
8219acffe7 - fixed pylint warnings
a3b10e8ab1 - fixed broken caching in S3 ext_pillar module (file_md5 was a list) - added debugging messages - static parameters are available as module parameters now
PR #26987: (rallytime) Back-port #26966 to 2015.5 @ 2015-09-09 18:42:51 UTC
PR #26966: (TheBigBear) URL has changed (refs: #26987)
3e902e86b1 Merge pull request #26987 from rallytime/bp-26966
6a29eac003 URL has changed
PR #26915: (rallytime) Update Joyent Cloud Tests @ 2015-09-09 15:04:50 UTC
eddb532713 Merge pull request #26915 from rallytime/joyent-tests
d4ad42d697 Update Joyent Cloud Tests
PR #26971: (rallytime) Fix a couple of typos in reactor docs @ 2015-09-09 15:03:54 UTC
f86814b2a4 Merge pull request #26971 from rallytime/reactor-doc-fix
0214daad19 Fix a couple of typos in reactor docs
ISSUE #26730: (styro) __opts__['user'] on Windows minion incorrect (eg for file.symlink) (refs: #26997, #`saltstack/salt`#26899`_`_, #26899)
PR saltstack/salt#26899: (twangboy) file.symlink gets windows account instead of root (refs: #26976)
PR #26976: (thatch45) Revert "file.symlink gets windows account instead of root" @ 2015-09-08 22:44:19 UTC
57b1080f94 Merge pull request #26976 from saltstack/revert-26899-fix_26730
6dd54e6bec Revert "file.symlink gets windows account instead of root"
PR #26975: (whiteinge) Remove mocks from rest_cherrypy integration tests; fix groups check bug @ 2015-09-08 22:34:08 UTC
67be01f5fe Merge pull request #26975 from whiteinge/rest_cherrypy-integration
9a0989585b Add additional 'groups' check to rest_cherrypy if groups are not used
d68aefcfde Remove mocks from rest_cherrypy integration tests
2aa3da8911 Rename the rest_cherrypy tests to conform to our convention
ISSUE #26730: (styro) __opts__['user'] on Windows minion incorrect (eg for file.symlink) (refs: #26997, #`saltstack/salt`#26899`_`_, #26899)
PR #26899: (twangboy) file.symlink gets windows account instead of root (refs: #26997) @ 2015-09-08 21:14:30 UTC
20a48f7f2e Merge pull request #26899 from twangboy/fix_26730
9d9b3bb47a file.symlink gets windows account instead of root
PR #26960: (rallytime) Fix bash code block formatting in CherryPy netapi docs @ 2015-09-08 18:14:11 UTC
dbc6b862f4 Merge pull request #26960 from rallytime/cherrypy-docs
c1420711db Fix bash code block formatting
PR #26940: (rallytime) Fix minor doc typo in client api @ 2015-09-08 04:15:00 UTC
f733e048c9 Merge pull request #26940 from rallytime/api-doc-fix
00fe6a225c Fix minor doc typo in client api
ISSUE #26850: (jfindlay) salt-ssh error on 2015.8 (refs: #26852)
PR #26871: (rallytime) Back-port #26852 to 2015.5 @ 2015-09-08 03:43:08 UTC
ISSUE #26644: (gravyboat) pkgrepo should note that for ubuntu/debian all options should not be used (refs: #26800, #26851)
ISSUE #26638: (WackyOne) Suse install documentation (refs: #26800, #26851)
PR #26851: (jacobhammons) states/pkgrepo examples, suse installation updates @ 2015-09-02 18:29:09 UTC
ISSUE #26804: (lrhazi) gpasswd error on RHEL 5 (refs: #26817)
PR #26817: (jfindlay) modify groupadd for rhel 5 @ 2015-09-02 14:52:53 UTC
5b1b934192 Merge pull request #26817 from jfindlay/grouparg
82d33939f3 modify groupadd for rhel 5
ISSUE #22724: (ty2u) digital_ocean_v2.py doesn't restore snapshot (refs: #26824)
PR #26824: (systembell) [salt-cloud] Fix creating droplet from snapshot in digital_ocean provider @ 2015-09-02 05:18:37 UTC
cdc0ea2fe3 Merge pull request #26824 from pravka/fix-droplet-creation-from-snapshot-in-dov2
00e3192536 removing log
e4a82d78d9 removing stringification of every value in the image dict
cdc2b4584a fixing condition for slug check
ISSUE #26805: (joejulian) cur_param referenced before assignment (refs: #26823, #26820)
PR #26823: (joejulian) use dbus instead of localectl @ 2015-09-02 00:25:25 UTC
4af6951a4c Merge pull request #26823 from joejulian/ctlfix
a9928cb143 pep8 fixes
6108ec4280 Gated dbus for os families that use it
e154c7b16f remove trailing spaces
c1c1266cc3 fix indent change
0a35320aa7 Use dbus directly
ISSUE #26805: (joejulian) cur_param referenced before assignment (refs: #26823, #26820)
PR #26820: (jfindlay) add default param in _parse_localectl in locale mod @ 2015-09-01 22:02:17 UTC
a1749b76b8 Merge pull request #26820 from jfindlay/ctlfix
3a2c0d5fbb add default param in _parse_localectl in locale mod
ISSUE #26788: (ssgward) Windows minion user.rename gives exception (refs: #26821)
PR #26821: (twangboy) Fixed user.rename function in windows @ 2015-09-01 22:01:50 UTC
ff733547c4 Merge pull request #26821 from twangboy/fix_26788
cf979e4877 Fixed user.rename function in windows
ISSUE #26754: (jefftucker) MySQLdb-python package should be included with windows minion installer (refs: #26803)
PR #26803: (twangboy) Added check for PyMySQL if MySQLdb import fails @ 2015-09-01 21:44:41 UTC
c892be3255 Merge pull request #26803 from twangboy/fix_26754
23576c65eb Added check for PyMySQL if MySQLdb import fails
ISSUE #26798: (jfindlay) stack trace from linode driver (refs: #26815)
PR #26815: (jfindlay) stringify linode id before performing str actions @ 2015-09-01 17:56:29 UTC
6edfa36083 Merge pull request #26815 from jfindlay/linstr
2ff5823944 stringify linode id before performing str actions
ISSUE #26644: (gravyboat) pkgrepo should note that for ubuntu/debian all options should not be used (refs: #26800, #26851)
ISSUE #26638: (WackyOne) Suse install documentation (refs: #26800, #26851)
ISSUE #26192: (jefftucker) Logging documentation does not exist (refs: #26800)
ISSUE #26108: (ahammond) documentation around scheduling and orchestration is unclear (refs: #26800)
ISSUE #24510: (ahammond) lack of documentation around Denied Keys (refs: #26800)
PR #26800: (jacobhammons) Doc bug fixes @ 2015-09-01 05:40:09 UTC
ISSUE #24021: (arthurlogilab) [salt-cloud saltify] AttributeError: 'str' object has no attribute 'setdefault' (refs: #26793)
PR #26793: (rallytime) Don't stacktrace if "name" is specified as a minion id in a map file @ 2015-08-31 19:24:25 UTC
da161b9516 Merge pull request #26793 from rallytime/fix-name-stacktrace
8601e4b341 Don't stacktrace if "name" is specified as a minion id in a map file
ISSUE #24020: (arthurlogilab) [salt-cloud saltify] cannot use --profile saltify machine{1..3} without a map (refs: #26790)
PR #26790: (rallytime) Update Saltify docs to be more accurate and helpful @ 2015-08-31 18:17:31 UTC
7c8d0a09f6 Merge pull request #26790 from rallytime/saltify_docs
d53754f2b7 Update Saltify docs to be more accurate and helpful
ISSUE #26773: (styro) salt-call minor breakage on Windows (refs: #26775)
PR #26787: (jfindlay) merge #26775 @ 2015-08-31 17:52:45 UTC
PR #26775: (styro) Fix some leftover non portable exitcodes. (refs: #26787)
70d0268c83 Merge pull request #26787 from jfindlay/imp
e5bbf59ec7 disable import lint in run.py
8aef725243 Restore blank lines again.
1710070f61 Restore blank line.
59d61a8dea os module no longer required.
f1b8d0d509 Add missing imports.
7bd8809e23 Fix some non portable exitcodes. Fixes #26773
PR #26759: (terminalmage) Backport PR #26726 to 2015.5 branch @ 2015-08-31 14:39:20 UTC
PR #26726: (terminalmage) Redact HTTPS Basic Auth in states/funcs which deal with git remotes (refs: #26759)
645998dbd3 Merge pull request #26759 from terminalmage/bp-26726
d7f7fca7e5 More cleanup from moving auth redaction to salt.utils.url
07db5a7038 fix redaction
399871e6dd Add auth redaction flags to git exec module and use them in git state
776dc38d73 check for ValueError when adding http basic auth
d2eb1f4340 Rename arguments in salt.utils.url.add_http_basic_auth
b45f37a467 Add http basic auth tests
1ed42ea4fd Remove git unit tests, moving them to salt.utils.url tests
96a55cdb59 Remove unused imports
1f25a859bd Redact HTTPS Basic Auth data from remote URLs in comments and changes dict
eafeb6c7bf Automatically redact HTTPS basic auth
6be3f8f9e1 Add support for callbacks to influence what information about commands is logged
c36f240a87 Add HTTPS Basic Auth funcs to salt.utils.url
ISSUE #26628: (MadsRC) state.ipset tries to parse wrong data (refs: #26768)
PR #26768: (garethgreenaway) Fixes to ipset in 2015.5 for #26628 @ 2015-08-29 03:24:07 UTC
46a4bbd0e7 Merge pull request #26768 from garethgreenaway/26628_2015_5_ipset_fixes
f0c6090c7e Fixing issue when information returned from ipset isn't in the format we expect and it causes an exception.
ISSUE #26732: (saltstack-bot) SmartOS pkgsrc dependency (refs: #26753)
PR #26753: (jfindlay) import elementree from _compat in ilo exec mod @ 2015-08-28 20:56:45 UTC
7a58878ea8 Merge pull request #26753 from jfindlay/iloet
211a02754f import elementree from _compat in ilo exec mod
ISSUE #21256: (dhs-rec) win.exe package for RH 6 (refs: #26736)
PR #26736: (twangboy) Changed import from smbconnection to smb3 @ 2015-08-28 17:23:42 UTC
22dbce8d61 Merge pull request #26736 from twangboy/fix_21256
86f425c669 Changed import from smbconnection to smb3
ISSUE #26705: (Galser) Salt-Master 2015.5.5-1 on Scientific Linux 6 fails loading some primitive pillars from YAML (refs: #26714)
PR #26714: (jfindlay) add exception placeholder for older msgpacks @ 2015-08-28 16:02:35 UTC
16d4e0350d Merge pull request #26714 from jfindlay/pack_except
ebcfaf9050 add exception placeholder for older msgpacks
PR #26710: (rallytime) Update GCE driver to return True, False or a new name in __virtual__() @ 2015-08-27 20:08:17 UTC
47faa8cc16 Merge pull request #26710 from rallytime/gce_virtual_return
e6b74879d7 Remove unused import
78e31585cf Update GCE driver to return True, False or a new name in __virtual__()
ISSUE #14612: (cachedout) Catch provider errors in salt cloud (refs: #26709)
PR #26709: (rallytime) Ensure VM name is valid before trying to create Linode VM @ 2015-08-27 20:07:49 UTC
cf487cf0f5 Merge pull request #26709 from rallytime/fix-14612
bc21094ea0 versionadded and more efficient checks
a3ac8e7008 Whitespace fix
9a4228d906 Added unit tests for new _validate_name function and adjusted regex
388815112c Ensure VM name is valid before trying to create Linode VM
ISSUE #9592: (otrempe) pip module fails on Windows because of quoting (refs: #26617)
PR #26617: (terminalmage) Fix Windows failures in pip module due to raw string formatting @ 2015-08-27 19:24:53 UTC
c3a6280f8c Merge pull request #26617 from terminalmage/issue9592
96c3df1ed5 Don't accept non-list input for pkgs arg
419221535b Lint fix
ede057eebc Fix tests to reflect args being passed as lists instead of strings
03250dbd9f Pass command to cmd.run_all as list instead of joining
1c90cdb07e salt/modules/pip.py: Remove raw string format flags
cd35df5ff8 Catch TypeErrors in timed_subprocess
PR #26700: (kev009) Ignore the first element of kern.disks split, which is the sysctl name @ 2015-08-27 17:48:02 UTC
24a4f54f39 Merge pull request #26700 from kev009/fbsd-disks-fix-2015.5
3ac97f9de4 Ignore the first element of kern.disks split, which is the sysctl name
PR #26695: (terminalmage) Better HTTPS basic auth redaction for 2015.5 branch @ 2015-08-27 15:10:38 UTC
58945131b5 Merge pull request #26695 from terminalmage/better-https-auth-redaction-2015.5
752d260209 Use versioninfo tuple for comparison
b1d253483e Better HTTPS basic auth redaction for 2015.5 branch
PR #26694: (terminalmage) Backport #26693 to 2015.5 @ 2015-08-27 08:16:30 UTC
PR #26681: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-08-26 22:03:07 UTC
0b17f80fe9 Merge pull request #26681 from basepi/merge-forward-2015.5
64cad371f0 Remove overmocked test
40718af1d5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
c2c7fe06c8 Merge pull request #26667 from nmadhok/doc-fix-2014.7
26be189689 Doc fix. Fixes #26656
6bd3dccae8 Merge pull request #26663 from jacobhammons/2014.7-version
b6af538070 version change for latest branch
071a6112e5 Merge pull request #26636 from rallytime/cloud-test-fixes
c0d83d558d Don't use id as variable
2b4bc1679d Keep ec2 instance creation test the same - it works better for the ec2 output
b5b58eb31f Skip digital ocean tests since we can't use API v1 with v2 tests
9ae1539c62 Update cloud tests to be more efficient and accurate
304542b4c6 Merge pull request #26640 from efficks/fixws2014
ebe5d9d85c Fix function spacing
PR #26676: (rallytime) Back-port #26648 to 2015.5 @ 2015-08-26 19:46:01 UTC
PR #26677: (rallytime) Back-port #26653 to 2015.5 @ 2015-08-26 19:45:54 UTC
PR #26653: (dmyerscough) You can provide a X-Auth-Token when requesting jobs (refs: #26677)
d7f682cb5b Merge pull request #26677 from rallytime/bp-26653
497ca96039 You can provide a X-Auth-Token when requesting jobs
PR #26675: (rallytime) Back-port #26631 to 2015.5 @ 2015-08-26 19:44:59 UTC
PR #26655: (damonzheng) Update win_dns_client.py @ 2015-08-26 16:05:26 UTC
db30926ac9 Merge pull request #26655 from cheng0919/2015.5
fdebc01def Update win_dns_client.py
1d23d5e797 Update win_dns_client.py
1a45db0fb7 Update win_dns_client.py
PR #26662: (jacobhammons) update version to 2015.5 @ 2015-08-26 13:45:44 UTC
a04d243471 Merge pull request #26662 from jacobhammons/version
4e5766fdde update version to 2015.5
PR #26651: (jfindlay) add 2015.5.4 notes to 2015.5.5 notes @ 2015-08-26 00:25:28 UTC
8a9a076ad4 Merge pull request #26651 from jfindlay/2015.5
dc5cee5f8f add 2015.5.4 notes to 2015.5.5 notes
ISSUE #26497: (JensRantil) Feature request: Make salt.states.managed support local file source (refs: #26525)
PR #26525: (jfindlay) document check_file_meta args, remove unused arg @ 2015-08-25 21:43:46 UTC
5bdefdc234 Merge pull request #26525 from jfindlay/sum
0297d49aa0 remove unused check_file_meta arg
6a3cb1c0aa document args to file.check_file_meta exec fcn
PR #26561: (stanislavb) Leave salt.utils.s3 location fallback to salt.utils.aws (refs: #27070) @ 2015-08-25 21:40:30 UTC
PR #26446: (stanislavb) Fetch AWS region from EC2 instance metadata (refs: #26561)
PR #26378: (stanislavb) Fix EC2 credentials from IAM roles for s3fs and s3 ext_pillar in 2015.5 (refs: #26446)
84e96458b3 Merge pull request #26561 from stanislavb/2015.5
50332895a1 Leave salt.utils.s3 location fallback to salt.utils.aws
ISSUE #22550: (amendlik) Error deleting SSH keys using salt-cloud --destroy (refs: #26573)
PR #26573: (rallytime) Don't stacktrace if using private_ips and delete_sshkeys together @ 2015-08-25 20:00:23 UTC
1d729734cc Merge pull request #26573 from rallytime/destroy_ssh_keys_private_ips
4267509c25 Don't stacktrace if using private_ips and delete_sshkeys
ISSUE #20169: (flavianh) [salt-cloud] Add a meaningful error when /etc/salt/cloud is missing the master's address (refs: #26563)
PR #26563: (rallytime) Fix error detection when salt-cloud config is missing a master's address @ 2015-08-25 20:00:11 UTC
000e5a2acf Merge pull request #26563 from rallytime/fix-20169
65b285d02d Only warn if master IP is unset - must be compatible with masterless minions
a4c87fcf57 Simplify logic
593ead08cf Fix error detection when salt-cloud config is missing a master's address
PR #26641: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-08-25 18:17:46 UTC
19c7a6d575 Merge pull request #26641 from basepi/merge-forward-2015.5
a5dafa436c Already fixed on 2015.5
71c0898fb5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
4532f98a76 Merge pull request #26515 from bersace/salt-env-local-sls
0727af9e3d Defaults to current saltenv in state.sls
PR #26620: (rallytime) Also add -Z to script args for cloud tests @ 2015-08-24 22:03:24 UTC
2927859c8a Merge pull request #26620 from rallytime/more_script_args
9ae27193d8 Also add -Z to script args for cloud tests
PR #26618: (rallytime) Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests @ 2015-08-24 21:15:24 UTC
ed166ebd4f Merge pull request #26618 from rallytime/pip-undate-cloud-tests
5a2c8825ba Extra lines
d28672b69e Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests
PR #26612: (rallytime) Use an available image to test against @ 2015-08-24 19:09:18 UTC
6d3927bed5 Merge pull request #26612 from rallytime/fix-do-list-images-test
1401255287 Use an available image to test against
ISSUE #15590: (jtratner) salt-cloud gce configuration check incorrect (refs: #26576)
PR #26576: (rallytime) Ensure GCE and EC2 configuration checks are correct @ 2015-08-23 18:59:46 UTC
991bbf63fe Merge pull request #26576 from rallytime/fix-14604
ac67a1d238 Ensure GCE configuration check is correct
421f1fde1e Ensure EC2 configuration check is correct
ISSUE #12225: (arthurlogilab) [salt-cloud] Attribution of floating IPs works partially in parallel mode (refs: #26580)
PR #26580: (rallytime) Avoid race condition when assigning floating IPs to new VMs @ 2015-08-23 18:58:48 UTC
746c0008a9 Merge pull request #26580 from rallytime/fix-12225
e3f7db17cc Avoid race condition when assigning floating IPs to new VMs
afda31be74 Create _assign_floating_ips function for DRY
PR #26581: (terminalmage) Skip tests that don't work with older mock @ 2015-08-22 23:06:27 UTC
965a4ba7cf Merge pull request #26581 from terminalmage/fix-tests
49d8bd1dbe Remove unused import
81a0d4c915 Skip tests that don't work with older mock
ISSUE #25478: (zyio) salt-ssh - Unable to locate current thin version (refs: #25862)
ISSUE #25026: (sylvia-wang) salt-ssh "Failure deploying thin" when using salt module functions (refs: #25862)
PR #26591: (rallytime) Back-port #26554 to 2015.5 @ 2015-08-22 21:19:02 UTC
PR #26565: (cachedout) Fix many errors with __virtual__ in tests @ 2015-08-21 21:37:54 UTC
2cd36c7ed4 Merge pull request #26565 from cachedout/fix_virtual_warnings
41541e4e2b Fix many errors with __virtual__ in tests
ISSUE #19249: (ahetmanski) Cannot create cache_dir salt master exception. (refs: #26548)
PR #26553: (rallytime) Back-port #26548 to 2015.5 @ 2015-08-21 17:40:21 UTC
PR #26552: (rallytime) Back-port #26542 to 2015.5 @ 2015-08-21 17:40:11 UTC
PR #26542: (arthurlogilab) [doc] reactor documentation fix : returners (refs: #26552)
7e67e48656 Merge pull request #26552 from rallytime/bp-26542
0976b1e23b [doc] reactor documentation fix : returners
PR #26551: (rallytime) Back-port #26539 to 2015.5 @ 2015-08-21 17:39:22 UTC
PR #26549: (rallytime) Back-port #26524 to 2015.5 @ 2015-08-21 17:38:50 UTC
PR #26524: (JensRantil) Gracefully handle package comparison not in (-1, 0, 1) (refs: #26549)
4dbf61c5af Merge pull request #26549 from rallytime/bp-26524
4763f28725 logging(cmp_version): output assertion
673b6c683d utils(version_cmp): handle comparison not in (0,1,-1)
ISSUE #26502: (ryan-lane) Adding a listener with None as ports doesn't result in an invocation error in boto_elb (refs: #26527)
PR #26527: (jfindlay) check exists and values in boto_elb listeners @ 2015-08-21 15:27:52 UTC
1ac8287588 Merge pull request #26527 from jfindlay/elb
343e47f00c check exists and values in boto_elb listeners
PR #26446: (stanislavb) Fetch AWS region from EC2 instance metadata (refs: #26561) @ 2015-08-21 15:11:08 UTC
PR #26378: (stanislavb) Fix EC2 credentials from IAM roles for s3fs and s3 ext_pillar in 2015.5 (refs: #26446)
e4b2534aa8 Merge pull request #26446 from stanislavb/2015.5-ec2-metadata-region
57943ff4f7 Fetch AWS region from EC2 instance metadata
PR #26546: (nmadhok) Do not raise KeyError when calling avail_images if VM/template is in disconnected state @ 2015-08-21 14:17:49 UTC
d721b7b2be Merge pull request #26546 from nmadhok/vmware-key-error-patch-2015.5
1dcf157256 Do not raise KeyError when calling avail_images if VM/template is in disconnected state
ISSUE #25360: (BretFisher) file.replace removes line feed if using YAML's multiline string syntax (refs: #26481)
PR #26537: (jfindlay) Merge #26481 @ 2015-08-21 05:37:24 UTC
PR #26481: (TheBigBear) minor note: added (refs: #26537)
7da87fabf1 Merge pull request #26537 from jfindlay/note
662e723ae0 fixup note lint in file.replace state mod
332535f2e6 Update file.py
598500034f Update file.py
ec7c7d738d minor note: added
PR #26528: (zmalone) Fixing encrypt to instructions in the 2015.5 branch @ 2015-08-20 21:49:06 UTC
c6d8e34730 Merge pull request #26528 from zmalone/2015.5
39b111c465 Fixing encrypt to instructions in the 2015.5 branch, --homedir is not necessary here.