Version 2015.8.1 is a bugfix release for 2015.8.0.
Total Merges: 201
Total Issue References: 39
Total PR References: 135
Contributors: 40 (DmitryKuzmenko, The-Loeki, TheBigBear, basepi, bechtoldt, bernieke, blueyed, cachedout, cedwards, clinta, cro, deuscapturus, dmurphy18, dsumsky, eliasp, flowhamster, isbm, jacksontj, jacobhammons, jfindlay, justinta, l2ol33rt, macgyver13, meggiebot, msteed, multani, nasenbaer13, perfinion, pprkut, rallytime, rhealitycheck, ruzarowski, ryan-lane, s0undt3ch, systembell, techhat, terminalmage, ticosax, twangboy, whiteinge)
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.
Add support for spm.d/*.conf
configuration of SPM (issue #27010)
Fix proxy
grains breakage for non-proxy minions (issue #27039)
Fix global key management for git state
Fix passing http auth to util.http
from state.file
(issue #21917)
Fix multiprocessing: True
in windows (on by default`)
Add pkg.info
to pkg modules
Fix name of serial
grain (this was accidentally renamed in 2015.8.0`)
Merge config values from master.d
/minion.d
conf files (rather than flat update`)
Clean grains cache on grains sync (issue #19853)
Remove streamed response for fileclient to avoid HTTP redirection problems (issue #27093)
Fixed incorrect warning about osrelease
grain (issue #27065)
Fix authentication via Salt-API with tokens (issue #27270)
Fix winrepo downloads from https locations (issue #27081)
Fix potential error with salt-call as non-root user (issue #26889)
Fix global minion provider overrides (issue #27209)
Fix backward compatibility issues for pecl modules
Fix Windows uninstaller to only remove ./bin
, salt*
, nssm.exe
, uninst.exe
(issue #27383)
Fix misc issues with mongo returner.
Add sudo option to cloud config files (issue #27398)
Fix regression in RunnerClient argument handling (issue #25107)
Fix dockerng.running
replacing creation hostconfig with runtime hostconfig (issue #27265)
Fix dockerng.running replacing creation hostconfig with runtime hostconfig (issue #27265)
Increased performance on boto asg/elb states due to __states__
integration
Windows minion no longer requires powershell to restart (issue #26629)
Fix x509 module to support recent versions of OpenSSL (issue #27326)
Some issues with proxy minions were corrected.
Proxy minions currently cannot execute a highstate because of the way the proxymodule is being loaded internally. This will be fixed in a future release.
Generated at: 2018-05-27 22:48:32 UTC
PR #27588: (jfindlay) add autogenerated 2015.8.1 release notes @ 2015-10-01 04:52:32 UTC
87d86e4b3e Merge pull request #27588 from jfindlay/2015.8
f2eb20f26b add autogenerated 2015.8.1 release notes
PR #27584: (jacobhammons) added changes list to 2015.8.1 release notes @ 2015-10-01 04:32:47 UTC
f7510baf33 Merge pull request #27584 from jacobhammons/release-notes
ee4a3b3549 added changes list for 2015.8.1
ISSUE #27532: (centromere) salt-cloud does not recognize terminated instances (refs: #27575)
PR #27575: (rallytime) Don't report existing instances as running only if they're actually terminated in EC2 @ 2015-09-30 22:17:24 UTC
1a31b19f15 Merge pull request #27575 from rallytime/fix-27532
57c6535fc2 Make sure message is the most accurate. Instance may be stopped or shutting down.
da6b4b3604 Don't report existing instances as running only if they're actually terminated
ISSUE #27290: (pirogoeth) Grains set in minion_opts do not appear in a call to grains.items. (refs: #27573)
PR #27573: (basepi) [2015.8] Use the custom yaml serializer for minion_opts for salt-ssh @ 2015-09-30 21:16:22 UTC
bee78a4e5c Merge pull request #27573 from basepi/salt-ssh.grains.minion_opts.27290
0785438b3f Use the custom yaml serializer for minion_opts for salt-ssh
ISSUE #27326: (ralphvanetten) Signing the X509 CA certificate does not work on Debian 8 (refs: #27514)
PR #27514: (clinta) Recent Versions of OpenSSL don't allow importing incomplete PEMs @ 2015-09-30 19:33:12 UTC
a4a53ecff5 Merge pull request #27514 from clinta/2015.8-27326
515e62bfa7 change "None" to empty string
2989f24169 fix 27326 and fix minor errors in docs.
PR #27564: (jacobhammons) Man pages @ 2015-09-30 19:29:37 UTC
6cf0228adc Merge pull request #27564 from jacobhammons/man-pages
cc37dc1087 updated version in salt.7
a9dcb23a13 regenerated man pages for 2015.8.1
ISSUE #26629: (efficks) Windows minion: Remove powershell dependencies (refs: #27522)
PR #27522: (twangboy) Removed dependency on powershell to restart salt-minion @ 2015-09-30 16:19:29 UTC
fd11e0cd95 Merge pull request #27522 from twangboy/fix_26629
163c54505d Fixed tests... hopefully
dc8c01ed07 Fixed some lint
2cb0f12696 Removed dependency on powershell to restart salt-minion
PR #27550: (rallytime) [2015.8] Clean up salt-cloud logging and make it more useful @ 2015-09-30 15:48:53 UTC
eb76531e96 Merge pull request #27550 from rallytime/cloud-logging
9e0fccd543 Don't commit private-ip changes from testing another bug...
78c85fbb31 Add unit tests for new recursive function
d9a2dc6bc5 [2015.8] Clean up salt-cloud logging and make it more useful
ISSUE #27281: (lrhazi) Wrong path for yum repo in installation-rhel-repo (refs: #27517)
ISSUE #27179: (samhamilton) Debian Install Instructions Shows Two Different Repos (refs: #27517)
PR #27517: (jacobhammons) Updated install docs @ 2015-09-30 15:19:51 UTC
PR #27526: (eliasp) Add missing newlines before param listing to fix doc rendering @ 2015-09-30 15:19:04 UTC
2a4c11ae24 Merge pull request #27526 from eliasp/2015.8-modules.slack_notify-doc-params
204e66943f Add missing newlines before param listing to fix doc rendering
PR #27525: (basepi) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2015-09-30 03:38:22 UTC
e5de9409c2 Merge pull request #27525 from basepi/merge-forward-2015.8
1f3eb1c526 Remove useless mocked unit test
73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
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
68d784c3dd Merge pull request #27472 from cachedout/fix_27447
5e745ad6da Change recommeded schema for data field in mysql event table
ee6e0ed057 Merge pull request #27468 from cachedout/fix_27351
0bc37c0d41 Fix test
f9a19720de fix sysctl truncating newline on os x
a214c7f84e Merge pull request #27479 from aboe76/fix_locale_suse
a8f2dad1be fix locale on opensuse and suse #27438
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.
9c2c028953 Merge pull request #27484 from rallytime/bp-27434-and-27470
5de2ee35ab Minor doc fixup.
af656c7e87 Doc: copy key to server via ssh-copy-id
927874d316 Merge pull request #27469 from twangboy/fix_27433
a996ea46e2 Added quotes to version numbers example
382a53403f Merge pull request #27467 from cachedout/lint_27375
4e54a98f5e Lint #27375
278ade52d2 file.managed: check contents_{pillar|grain} result
ed6207a438 Merge pull request #27419 from rallytime/fix-9856
551396564a Ammend error log to include multiple tips for troubleshooting.
73fa89edf7 Merge pull request #27426 from rallytime/fix-16753
f6cbd81e66 Don't stacktrace if there are conflicting id errors in highstate
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
8f9a3cfbaf Merge pull request #27410 from jacobhammons/doc-updates
a9fdecada1 Fix css layout Refs #27389 sample typo fix in linux_acl additional module folders listed in dynamic-modules
3746085587 Merge pull request #27336 from rallytime/cloud-logging-five
7956b36076 [2015.5] Fixup salt-cloud logging
5a3be10a3e Merge pull request #27358 from lorengordon/escape-search-replacement-text
88bb1fbfff Escape search replacement text, fixes #27356
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
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
a372466922 Merge pull request #27317 from efficks/fix27316
bf216c101e State unzip should use unzip command instead of unzip_cmd. Issue #27316
bd3771e80f Merge pull request #27309 from rallytime/fix-15514
9383d91ff8 Change a value list to a comma-separated string in boto_route53.present
b5fe944875 Merge pull request #27311 from jfindlay/maxoc
8ec2e921bd discuss replacement occurrences in file doc
PR #27513: (terminalmage) Fix integration tests for worktree addition in git >= 2.6 @ 2015-09-29 18:39:19 UTC
0e37fb3bd3 Merge pull request #27513 from terminalmage/fix-worktree-tests
519bdd6438 Fix integration tests for worktree addition in git >= 2.6
PR #27510: (rallytime) Merge #27475 with test fixes @ 2015-09-29 18:34:32 UTC
PR #27475: (ryan-lane) Use __states__ for calls to other boto states (refs: #27510)
e974a3c8aa Merge pull request #27510 from rallytime/ryan-lane-test-fix
cae2c4e715 Syntax fix
458547ba03 Fix test failures for boto __state__ changes
5e25454fc1 Followups for using __states__
a01f8ac62c Use __states__ for calls to other boto states
ISSUE #27265: (Arabus) State: dockerng.running; creation hostconfig replaced with runtime hostconfig when using runtime options (refs: #27451)
PR #27451: (ticosax) [dockerng] Enforce usage of host_config and require docker-py>=1.4.0 @ 2015-09-29 15:51:28 UTC
d85b0cbd69 Merge pull request #27451 from ticosax/dockerng-host-config-support
b184faa55b Enforce usage of host_config and require docker-py>=1.4.0
PR #27461: (cachedout) Only clean context if it exists @ 2015-09-29 15:49:52 UTC
e8f58a6a3f Merge pull request #27461 from cachedout/clean_context_ioloop
7367a4e32b Only clean context if it exists
ISSUE #27220: (TheBigBear) [ERROR ] Exception 'close_fds is not supported on Windows platforms if you redirect stdin/stdout/stderr' (refs: #27473)
PR #27473: (terminalmage) salt.utils.gitfs: Don't use close_fds=True on Windows @ 2015-09-29 15:34:03 UTC
25a30a5621 Merge pull request #27473 from terminalmage/issue27220
fa70ef2e31 salt.utils.gitfs: Don't use close_fds=True on Windows
PR #27496: (blueyed) Fix version reporting of gitpython @ 2015-09-29 15:31:48 UTC
3807cd5c4e Merge pull request #27496 from blueyed/fix-gitpython-version
d8969363c8 Fix version reporting of gitpython
PR #27502: (ticosax) Add test to check we don't call inspect_image on absent images. @ 2015-09-29 15:15:09 UTC
PR #27497: (blueyed) dockerng: fix image_present for forced, non-existent image @ 2015-09-29 13:49:46 UTC
f3da6e4bb3 Merge pull request #27497 from blueyed/dockerng-fix-404-private-forced
e3c66cea3a dockerng: fix image_present for forced, non-existent image
ISSUE #27205: (msummers42) In git.config_set state CommandExecutionError occurs when global=True when using salt 2015.8.0 (refs: #27411)
PR #27411: (terminalmage) Fix invocation of git.config_get and git.config_set @ 2015-09-28 22:53:01 UTC
284984e6ba Merge pull request #27411 from terminalmage/issue27205
c3a17ae992 add missing commas
f2751ef7c4 Fix shadowed outer-scope attributes
81a6c27010 Fix invocation of git.config_get and git.config_set
ISSUE #27217: (nasenbaer13) Gitfs cleans up wrong directories (refs: #27218, #27477, #27276, #27382)
PR #27477: (terminalmage) Don't append role to hash_cachedir @ 2015-09-28 22:26:34 UTC
PR #27474: (whiteinge) Add fake pymongo version attribute for the docs @ 2015-09-28 21:49:25 UTC
2f71833260 Merge pull request #27474 from whiteinge/docs-pymongo-fix
64b54e668a Add fake pymongo version attribute for the docs
PR #27466: (blueyed) Fix version reporting of python-gnupg and mysql-python @ 2015-09-28 20:25:01 UTC
9202f956f3 Merge pull request #27466 from blueyed/fix-gnupg-version
9c1454fe59 Fix version reporting of mysql-python
437fb4407e Fix version reporting of python-gnupg
PR #27465: (ticosax) Fix usage of dockerng "cmd" was #27459 @ 2015-09-28 19:27:41 UTC
PR #27459: (terminalmage) Fix usage of dockerng "cmd" (refs: #27465)
PR #27444: (ticosax) docker-py expect only command argument not cmd (refs: #27459)
PR #27331: (terminalmage) dockerng: Allow both cmd and command to be used to specify command (refs: #27459, #27444)
6d8e9af297 Merge pull request #27465 from ticosax/fix-dockerng-cmd
a1ed6cda56 Skip test if docker-py is not installed
6f7769aa94 Correct log messages/docstrings
cc8471bd1b dockerpy expect only command argument not cmd
ISSUE #27409: (pcn) 2015.8.0 API (cherrypy) fails to lookup job id via pepper (refs: #27417)
ISSUE #25107: (whiteinge) Regression in RunnerClient argument handling (refs: #25243)
PR #27417: (whiteinge) Backport #25243 into 2015.8 @ 2015-09-28 19:15:53 UTC
PR #25243: (DmitryKuzmenko) Runnerclient regression fix (refs: #27417)
aefe6d794a Merge pull request #27417 from whiteinge/bp-25243
53e7a6b7c5 RunnerClient support old style commands with kwargs on top level.
10b522b86c Revert "Fixed GET /jobs/<id> requests"
PR #27423: (dmurphy18) Changes to support configurable repository for Debian / Ubuntu @ 2015-09-28 17:34:22 UTC
a07411a4d9 Merge pull request #27423 from dmurphy18/dgm_envfix
63407fd2a9 Changes to support configurable repository for Debian / Ubuntu
ISSUE #26689: (double-yaya) Salt - SSH using machine IP to execute commands, without having to write a roster file (refs: #27398)
PR #27428: (rallytime) Back-port #27398 to 2015.8 @ 2015-09-28 15:03:16 UTC
PR #27398: (flowhamster) Allow cloud roster to use sudo (refs: #27428)
d4d96bb3fc Merge pull request #27428 from rallytime/bp-27398
6969326ae2 doc: added documentation to cloud roster and fixed whitespace
b4334649d5 Allow cloud roster to use sudo
PR #27429: (rallytime) Back-port #27344 to 2015.8 @ 2015-09-28 15:01:20 UTC
PR #27344: (rhealitycheck) Mongo returners patch 1 (refs: #27429)
668c69bd7e Merge pull request #27429 from rallytime/bp-27344
e39a57afe1 Update mongo_return.py
f796c9a44b Update mongo_return.py
30d07cbb27 Update mongo_return.py
44ef4b48fb Update mongo_future_return.py
34b160b841 Update mongo_return.py
b2b5623da3 Update mongo_future_return.py
07f9a8b95b Update mongo_return.py
b7ddc83b4d Update mongo_future_return.py
540b3f2690 Update mongo_return.py
405edd0718 Update mongo_future_return.py
5c753a54ff Update mongo_return.py
06e05befa7 Update mongo_future_return.py
PR #27450: (ticosax) [dockerng] Fix typo in docstring @ 2015-09-28 14:27:35 UTC
c639931340 Merge pull request #27450 from ticosax/fix-typo
9cea62de67 Fix typo in docstring
PR #27430: (jacksontj) Fix bug introduced in eee0291ff8b65ff1e22f4dc2447a74aa28a3ce7f @ 2015-09-26 01:09:40 UTC
333c305ba0 Merge pull request #27430 from jacksontj/2015.8
d2aff12f8f Fix bug introduced in eee0291ff8b65ff1e22f4dc2447a74aa28a3ce7f
PR #27418: (terminalmage) Don't always remove dest path in salt.utils.files.rename() @ 2015-09-25 23:09:59 UTC
1f4ca089a2 Merge pull request #27418 from terminalmage/file-rename
7bc0949d48 Don't always remove dest path in salt.utils.files.rename()
ISSUE #27032: (lorengordon) Windows Installer: Please be more kind to existing configurations (refs: #27383)
PR #27383: (twangboy) Uninstaller only removes specific files and dirs @ 2015-09-25 22:47:24 UTC
ec5faf1829 Merge pull request #27383 from twangboy/fix_27032
63a7305ae9 Uninstaller only removes specific files and dirs
PR #27416: (rallytime) Back-port #27399 to 2015.8 @ 2015-09-25 22:39:07 UTC
PR #27399: (multani) Various documentation fixes (refs: #27416)
9ab3c6dc5d Merge pull request #27416 from rallytime/bp-27399
1d848118c9 doc: fixed indentation in salt.renderers.jinja's documentation
f5d053a033 doc: fixed indentation in salt.modules.consul's documentation
06beea6b2f doc: fix etcd state documentation typos
97e69ebb97 doc: fix state's top documentation typo
b411730d60 doc: fix documentation formatting for state blockdev
ce91bb9446 doc: fix formatting in state boto_elb
c69229875e doc: fix links in Docker state documentation
15b751d6e2 doc: Docker state use ports and not port_bindings anymore
880b6e0944 doc: fix link to docker-py documentation
33db0c27f8 doc: fix RAET links
e69ba2f943 doc: fix rendering of salt.states.hipchat
ISSUE #27093: (TheBigBear) 2015.8.0 winrepo downloader corrupts some installers (refs: #27394, #27163)
PR #27394: (jacksontj) Remove streamed response for fileclient to avoid HTTP redirection problems @ 2015-09-25 21:55:31 UTC
PR #27163: (terminalmage) Workaround upstream tornado bug affecting redirects (refs: #27394)
9842d9728b Merge pull request #27394 from jacksontj/2015.8
01132c305c Re-add files.rename call instead of os.rename
acf2d51440 Remove streamed response for fileclient to avoid HTTP redirection problems
a6ecf35f25 Revert "Remove unused import"
66c73a3996 Revert "Workaround upstream tornado bug affecting redirects"
PR #27415: (ryan-lane) Backwards compat fixes for pecl module @ 2015-09-25 19:40:55 UTC
44b246bf93 Merge pull request #27415 from lyft/fix-pecl
8be8ef585c Backwards compat fixes for pecl module
PR #27407: (meggiebot) Adding stretch label definition @ 2015-09-25 18:10:46 UTC
d76a77c911 Merge pull request #27407 from saltstack/meggiebot-patch-1
1c779700f6 Adding stretch label definition
ISSUE #27209: (justinta) Provider overrides appear to be broken (refs: #27388)
PR #27388: (basepi) [2015.8] Fix global provider overrides @ 2015-09-25 16:49:03 UTC
db6acfd832 Merge pull request #27388 from basepi/provider.overrides.27209
d87147e14b Don't use ret.items(), forces load of all modules
a5ee33a9ad pack __salt__ before loading provider overrides
ISSUE #27354: (gravyboat) salt-ssh roster docs should note the requiretty option (refs: #27386)
PR #27386: (rallytime) Document tty: True usage in salt-ssh roster file @ 2015-09-25 15:44:12 UTC
b72e0b1133 Merge pull request #27386 from rallytime/fix-27354
08c04da48b Document tty: True usage in salt-ssh roster file
PR #27380: (justinta) Skipping Async tests @ 2015-09-25 15:13:04 UTC
51e765078a Merge pull request #27380 from jtand/async_tests
fd0dedeb99 Skipping Async tests
ISSUE #27217: (nasenbaer13) Gitfs cleans up wrong directories (refs: #27218, #27477, #27276, #27382)
PR #27382: (terminalmage) Revert "fixes #27217 clear_old_remotes clears wrong directory (gitfs)" @ 2015-09-24 22:54:23 UTC
PR #27361: (cro) Correct some issues with proxy minions @ 2015-09-24 16:03:38 UTC
12a021da11 Merge pull request #27361 from cro/pxm_doc
1a2c41c9e3 Add versionadded.
93a6397598 func_alias should be list_ and should have a corresponding list_ fn.
0221f7ee4e Pylint
3a297d8036 Add release notes for proxy fixes.
39df44b841 Pylint
e3ebff9bce Fix some problems with the rest_sample, remove unnecessary file and make sure that rest_service has the right contents.
f4944fe68a Fix typo in docs
PR #27364: (ruzarowski) SaltCloud[EC2] Fix missing credentials in modify_eni_properties api call @ 2015-09-24 13:55:39 UTC
cff74510de Merge pull request #27364 from ruzarowski/2015.8-modify-eni-properties-api-call
100eea46d5 Issue #27121 - Remove leftover code comment
c58e7a00f3 Issue #27121 - Attempt to fix missing credentials when modifying eni properties
5d292a221e Merge remote-tracking branch 'upstream/2015.8' into 2015.8
4dbd9ebb30 Merge remote-tracking branch 'upstream/2015.8' into 2015.8
PR #27349: (jfindlay) add freebsd install docs to release notes @ 2015-09-24 13:51:02 UTC
928ef59a8a Merge pull request #27349 from jfindlay/doc_typos
e509cfca17 fix typo in 2015.8.0 pull list
7137e731d3 add FreeBSD documentation to 2015.8.0 notes
ISSUE #26889: (UtahDave) salt-call w/non root user outputs repeating error (refs: #27343)
PR #27343: (cachedout) Close io loop before deleting attribute @ 2015-09-24 13:49:55 UTC
331230ea4f Merge pull request #27343 from cachedout/issue_26889
2b648e51af Close io loop before deleting attribute
PR #27337: (rallytime) [2015.8] Fixup salt-cloud logging @ 2015-09-24 13:49:17 UTC
PR #27332: (terminalmage) Adjust dockerng/dockerio docstrings @ 2015-09-24 13:45:34 UTC
b2f8418ffc Merge pull request #27332 from terminalmage/adjust-dockerng-docstring
bdbf4d8e5c Add deprecation notice to dockerio state module
17829ab38d Fix name of dockerng module in dockerio docstring
ed5ae75180 Adjust dockerng docstrings
PR #27353: (cachedout) Fix case where var not set in config @ 2015-09-23 21:45:32 UTC
ac9e6c2532 Merge pull request #27353 from cachedout/fix_retry_get
ea286e1874 Fix case where var not set in config
ISSUE #21390: (fyatzeck) Having trouble with GCE cloud profile assigning static IP and enabling IP forward (refs: #27350)
PR #27350: (rallytime) Allow IP-forwarding in GCE driver @ 2015-09-23 21:36:41 UTC
3f6b06116f Merge pull request #27350 from rallytime/fix-21390
2bf566d934 Allow IP-forwarding in GCE driver
484015a7a3 Added version tag for ex_disk_type option
a71ebc97b2 Allow use of rst header links by separating options out from yaml example
ISSUE #27103: (twangboy) Salt-Minion doesn't display logs for new processes with multiprocessing on (refs: #27305)
PR #27305: (cachedout) Re-init logging system on Windows when using multiprocessing @ 2015-09-23 15:32:32 UTC
6f3da863fc Merge pull request #27305 from cachedout/issue_27103
7a7492d186 Fix typo
22c653482c Re-init logging system on Windows when using multiprocessing
PR #27331: (terminalmage) dockerng: Allow both cmd and command to be used to specify command (refs: #27459, #27444) @ 2015-09-23 15:27:43 UTC
684e33aeb2 Merge pull request #27331 from terminalmage/dockerng-cmd
7d4eaac8ae dockerng: Allow both cmd and command to be used to specify command
PR #27327: (isbm) Fix a typo in the RPM output @ 2015-09-23 14:27:42 UTC
a3f4fa1106 Merge pull request #27327 from isbm/isbm-pkg-info-typofix
7912f8c13b Fix typo
PR #27312: (basepi) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2015-09-22 22:52:14 UTC
a789303d75 Merge pull request #27312 from basepi/merge-forward-2015.8
647080d064 Add missing import
95e70f0bef Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
ca4597b93a Merge pull request #27310 from basepi/merge-forward-2015.5
7b75e4aed1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
e90412d3b8 Merge pull request #27252 from jfindlay/version.2014.7
3d28307a00 2014.7 -> 2014.7.0
982c21c79f Merge pull request #27308 from terminalmage/fix-refresh_db-regression
77686fb7ce Fix refresh_db regression in yumpkg.py
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
02482c0572 Merge pull request #27278 from rallytime/bp-27256
1beddf6311 Fix error handling in salt.modules.file.statvfs
e36c019c37 Merge pull request #27277 from rallytime/bp-27230
3ce77db1bc Fix typo in AWS doc config
b22286476e Merge pull request #27253 from jfindlay/version.2015.5
967e3bb72a 2015.5 -> 2015.5.0
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
26540f15bc Merge pull request #27231 from jfindlay/cronchange
1e335297e2 only write cron file if it is changed
PR #27303: (jacobhammons) Updated module doc index using https://github.com/saltstack/salt/pull… @ 2015-09-22 19:29:04 UTC
c3b690273b Merge pull request #27303 from jacobhammons/ref-updates
7ac98a03b6 Updated module doc index using https://github.com/saltstack/salt/pull/27203
ISSUE #27081: (TheBigBear) winrepo - SSLError: [Errno 1] _ssl.c:510: error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed (refs: #27301)
PR #27301: (twangboy) Pass ca_bundle for windows (fixes SSL Error) @ 2015-09-22 19:00:45 UTC
aaa2db9943 Merge pull request #27301 from twangboy/fix_27081
5c4f5f8944 Changed windows gate to check for verify_ssl option
e2fe5a60b5 Pass ca_bundle for windows (fixes SSL Error)
PR #27300: (rallytime) Back-port #27287 to 2015.8 @ 2015-09-22 16:59:07 UTC
PR #27287: (rhealitycheck) Mongo returners patch 1 (refs: #27300)
55f4050146 Merge pull request #27300 from rallytime/bp-27287
e49a6dc449 Update mongo_return.py
63153322b9 Update mongo_future_return.py
PR #27288: (rallytime) Filter on 'name', not 'id', when listing images @ 2015-09-21 22:37:26 UTC
d96462af48 Merge pull request #27288 from rallytime/do-cleanup
6e16fad760 Use name in all places, not id.
9b34542cb0 Filter on 'name', not 'id', when listing images
PR #27283: (justinta) __grains__['osrelease'] returns a string @ 2015-09-21 19:18:44 UTC
688f24e9e4 Merge pull request #27283 from jtand/yumpkg_yum_fix
b73f5289b4 __grains__['osrelease'] returns a string. Cast to int for correct comparison
ISSUE #27217: (nasenbaer13) Gitfs cleans up wrong directories (refs: #27218, #27477, #27276, #27382)
PR #27276: (rallytime) Back-port #27218 to 2015.8 @ 2015-09-21 19:05:54 UTC
PR #27275: (rallytime) Back-port #27213 to 2015.8 @ 2015-09-21 19:05:18 UTC
PR #27213: (macgyver13) Make get_event compatible with salt/client (refs: #27275)
d5ce81e8e7 Merge pull request #27275 from rallytime/bp-27213
5d4c90c479 Make get_event compatible with salt/client
PR #27274: (rallytime) Back-port #27272 to 2015.8 @ 2015-09-21 18:54:48 UTC
PR #27271: (isbm) Bugfix: crash on token authentication via API @ 2015-09-21 15:53:09 UTC
c0943dd4d1 Merge pull request #27271 from isbm/isbm-bufix-27270
fc524c17b9 Reduce the criteria that would match empty iterables as well as None or False values
3152af78b5 Fix the crash on token auth via API (http://git.io/vn4tx)
ISSUE #19947: (gczuczy) Unable to supply provisioning script to softlayer create() (refs: #27251)
PR #27251: (rallytime) Add support for post_uri in SoftLayer cloud drivers @ 2015-09-21 15:43:16 UTC
b11ce6ac2a Merge pull request #27251 from rallytime/fix-19947
aafb776808 Add support for post_uri in SoftLayer cloud drivers
ISSUE #21879: (bechtoldt) Reference pages in documentation are outdated again (refs: #27260, #25019, #21880)
ISSUE #19262: (bechtoldt) salt.pillar.file_tree doesn't appear in the documentation (refs: #27260, #25019)
PR #27260: (bechtoldt) add missing module doc references @ 2015-09-21 05:48:38 UTC
PR #25019: (bechtoldt) add missing module documentation to references (refs: #27260)
PR #24421: (bechtoldt) add missing module documentation (refs: #27260, #25019)
PR #21880: (bechtoldt) update references, fixes #21879 (refs: #27260, #25019)
PR #20039: (bechtoldt) completing some doc references (refs: #27260, #25019)
de6e5abe6c Merge pull request #27260 from bechtoldt/missing_refs
3a7d31a91c add missing module references
PR #27254: (jfindlay) 2015.2,2015.8,Beryllium -> 2015.8.0 @ 2015-09-18 23:44:46 UTC
1a32b9f778 Merge pull request #27254 from jfindlay/version.2015.8
8ea15f498e 2015.2,2015.8,Beryllium -> 2015.8.0
ISSUE #25079: (jondonas) Salt-cloud does not check for duplicate ssh keys when using provider such as DigitalOcean (refs: #27245)
PR #27245: (rallytime) If two ssh keynames are found in DigitalOcean, abort and warn the user. @ 2015-09-18 21:42:36 UTC
f3a847823b Merge pull request #27245 from rallytime/fix-25079
4b0f7cce1d If two ssh keynames are found in DigitalOcean, abort.
ISSUE #27065: (lorengordon) 2015.8.0: yumpkg reporting "Unexpected osrelease grain '6.7'" (refs: #27241)
PR #27241: (jfindlay) osrelease is only an integer for fedora @ 2015-09-18 21:40:50 UTC
e4a5b004ae Merge pull request #27241 from jfindlay/yumwarn
1f7570250f osrelease is only an integer for fedora
PR #27234: (basepi) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2015-09-18 20:41:38 UTC
f8e71f6d7d Merge pull request #27234 from basepi/merge-forward-2015.8
be2b0fc497 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
579f375f74 Merge pull request #27233 from basepi/release.notes.stubs
f4563ea9b7 Add stub release notes for 2015.5.6
f5a322e3f2 Merge pull request #27208 from basepi/nop.state.25423
9414b05b2c Add test.nop example
a84ce67b8f Add test.nop state
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
560545c4c5 Merge pull request #27214 from jacksontj/2015.5
e7526bdb44 Correctly support https, port 443 is not a requirement
7a34c7742d Merge pull request #27172 from rallytime/bp-27150
0d7ee4b209 Merge config values from master.d/minion.d conf files
PR #27240: (isbm) Backport of the fix of 'pkg.info*' for Beryllium @ 2015-09-18 20:02:15 UTC
2d6c75cbd7 Merge pull request #27240 from isbm/isbm-pkg.info-tz-bugfix-backport-2015.8
19a361851a Return install date only if possible.
ff857bc8aa Return RPM package time in UTC timezone
eaa0f370bf Remove time fraction and return ISO in UTC
ce9570fce6 Return UTC timestamp for modification of path.
ISSUE #27222: (pprkut) Support firewalld zone configuration in network.managed state for rh7 systems (refs: #27223)
PR #27223: (pprkut) Support firewalld per interface zone config on rh7 systems @ 2015-09-18 19:44:45 UTC
PR #27238: (bechtoldt) salt.modules.disk.percent() throws KeyError when partition doesn't exist (refs: #27239) @ 2015-09-18 19:37:00 UTC
652b2998af Merge pull request #27238 from bechtoldt/fix_disk_percent_keyerror
0511f611bb prevent KeyError by checking whether partition even exists
PR #27232: (basepi) [2015.8] Add stub release notes for 2015.8.1 @ 2015-09-18 16:53:01 UTC
253ac5e0c3 Merge pull request #27232 from basepi/release.notes.stubs
25410706ee Add stub release notes for 2015.8.1
ISSUE #24573: (bailsman) cloud.profile RuntimeError: dictionary changed size during iteration (refs: #27199)
PR #27199: (rallytime) Avoid RunTimeError (dictionary changed size during iteration) with keys() @ 2015-09-18 15:44:27 UTC
c542cd49d0 Merge pull request #27199 from rallytime/fix-24573
6b2a00e947 Avoid RunTimeError (dictionary changed size during iteration) with keys()
PR #27206: (rallytime) Don't repeat GCE setup instructions, and make the use of .json files clearer @ 2015-09-18 14:38:40 UTC
6b79ad69a9 Merge pull request #27206 from rallytime/gce-doc-cleanup
cced6e9031 Don't repeat GCE setup instructions, and make the use of .json files clearer
PR #27210: (rallytime) Refactor some digital ocean functions @ 2015-09-18 14:38:01 UTC
1d022eb5de Merge pull request #27210 from rallytime/do-clean-up
808a5b3b81 Make sure we set the full data to the ret variable
9b635004e2 Refactor some digital_ocean functions to help simplify the driver
PR #27197: (basepi) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2015-09-17 19:53:22 UTC
8c204a45ab Merge pull request #27197 from basepi/merge-forward-2015.8
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
e956d88f5f Merge pull request #27194 from rallytime/bp-27180
327d343fef file copy ret result True if no change in test mode
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
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
28cfdfd067 Merge pull request #27167 from rallytime/bp-27148
d12be52355 Pass filepointers to the serialize load functions.
4495f4f4d0 Merge pull request #27168 from techhat/gateimpacket
cc448bfdc1 Add further gating of impacket library
3e5ef0dc30 Merge pull request #27166 from rallytime/fix-27100
50fb3a489a Allow a full-query for EC2, even if there are no profiles defined
f1c9de7ed9 Merge pull request #27162 from rallytime/softlayer-service
d281068c70 Be explicit in using "SoftLayer" for service queries in SoftLayer drivers
59e9dfd8de Merge pull request #27149 from twangboy/fix_27133
7992b7e20a Fixed some tests... hopefully...
d4c8e30f5d Fixed problem with add/remove path
097fcd1017 Merge pull request #27147 from rallytime/fix-11669
55312ea03f Provide a more friendly error message.
36555856c7 Enforce bounds in the GCE Regex
f5c3f157dd Merge pull request #27128 from eguven/2015.5-fix-test-diff
ec2d68a84a don't show diff for test run if show_diff=False
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
440855b182 Merge pull request #27033 from jfindlay/n0ne
3334b9d548 fix comment and unit test for reg state
391a09d5ac update reg state unit tests
ebbf2b05ca Fixed reg state module for None, 0, and '' values
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 #27195: (jacobhammons) Fixed sphinx / latex build warnings and errors @ 2015-09-17 17:28:37 UTC
430c48c5ea Merge pull request #27195 from jacobhammons/doc-build
fad87e34a2 Fixed lint errors
e56f02b025 re-add cheatsheet do-over
60a8330561 re-added cheatsheet.tex
f7a9e25d52 Fixed sphinx / latex build warnings and errors Added missing modules to contents
PR #27182: (bernieke) fix restart_on_error @ 2015-09-17 17:24:01 UTC
ISSUE #27093: (TheBigBear) 2015.8.0 winrepo downloader corrupts some installers (refs: #27394, #27163)
PR #27163: (terminalmage) Workaround upstream tornado bug affecting redirects (refs: #27394) @ 2015-09-17 16:09:01 UTC
97d2a5fddc Merge pull request #27163 from terminalmage/issue27093
80b396db73 Handle potential ValueError when checking content length
a89c987943 Remove unused import
469e18f74c Workaround upstream tornado bug affecting redirects
f2a562ac60 Add salt.utils.files.rename() for cross-platform renaming
ISSUE #19954: (gczuczy) Multiple disks on softlayer (refs: #27173)
PR #27177: (rallytime) Remove note - incorrect info @ 2015-09-17 01:34:04 UTC
ISSUE #19954: (gczuczy) Multiple disks on softlayer (refs: #27173)
PR #27173: (rallytime) Add the ability to specify multiple disks on the SoftLayer driver (refs: #27177) @ 2015-09-17 00:32:57 UTC
cbb7e7f1a5 Merge pull request #27173 from rallytime/fix-19954
45c6aabde9 DeviceID '1' is reserved for the SWAP disk; let's skip it.
54e104cf5b Don't stacktrace if local_disk isn't set
fe74d203f5 Add the ability to specify multiple disks on the SoftLayer driver
ISSUE #22724: (ty2u) digital_ocean_v2.py doesn't restore snapshot (refs: #26824)
PR #27164: (rallytime) Make sure changes from #26824 to digital_ocean_v2.py driver make it to digital_ocean.py in 2015.8 @ 2015-09-16 18:55:17 UTC
PR #26824: (systembell) [salt-cloud] Fix creating droplet from snapshot in digital_ocean provider (refs: #27164)
0e04588d58 Merge pull request #27164 from rallytime/add-26824-changes-to-2015.8
a44bd763dd Make sure changes from #26824 to digital_ocean_v2.py driver make it to digital_ocean.py in 2015.8
ISSUE #19853: (ksalman) master needs a way to invalidate grains on the minion (refs: #27143)
PR #27143: (cachedout) Clean grains cache on grains sync @ 2015-09-16 16:27:06 UTC
38d93a96fe Merge pull request #27143 from cachedout/clean_grains_cache_on_sync
0a660a9f80 Break apart long line
6de2c2a50c Better error checking
252f7c7ea9 Clean grains cache on grains sync
ISSUE #18582: (mainframe) Allow merging file_roots and pillar_roots from different config files included from master.d (refs: #27150)
PR #27150: (cachedout) Merge config values from master.d/minion.d conf files (refs: #27172) @ 2015-09-16 15:36:41 UTC
626cbe61ce Merge pull request #27150 from cachedout/issue_18582
6351a94d08 Merge config values from master.d/minion.d conf files
ISSUE #27135: (SEJeff) Regression in core grains in the latest version of salt (refs: #27137)
PR #27137: (jfindlay) revert serial grain regression @ 2015-09-15 21:52:25 UTC
PR #27144: (rallytime) Don't stacktrace on softlayer_hw.show_all_prices if a code isn't supplied @ 2015-09-15 21:52:09 UTC
58b56b9d78 Merge pull request #27144 from rallytime/softlayer-fixes
3963a5cf0f Don't stacktrace on softlayer_hw.show_all_prices if a code isn't supplied
PR #27139: (jacobhammons) Updated key instruction on rhel7 @ 2015-09-15 16:06:14 UTC
b71de75c1c Merge pull request #27139 from jacobhammons/rhel-doc
7ed9f6260f Updated key instruction on rhel7
PR #27134: (isbm) Backport to 2015.8: "pkg.info" @ 2015-09-15 15:57:46 UTC
0d8248930e Merge pull request #27134 from isbm/isbm-pkg.info-backport-2015.8
b60e6a37a7 Lintfix: E7801, C0321
cb4706c7e8 Add license extraction for Dpkg.
38753fe8b2 Enhance filter for the "technical" fields that are not generally needed as a package information for the CMDB
ffe8f14dae Implement additional package information merger
2aafc469d0 Fix the size and installed-size keys
3fc389435b Add homepage translator key
25040c9c71 Docfix
911bae1baf Add alias for 'info' of deprecation in v. Boron
306958dad0 Fix renamed method
6ba269fbc6 Remove 'N/A' when no data.
137eb75ca2 Rename existing 'info' to 'info_available'
7b376fd5c3 Implement compatible 'info_installed'. Returned keys are common to other systems with other package managers
ca7d0d5025 Implement compatible 'info_installed'. Returned keys are common to other systems with other package managers
c1faebf0b5 Implement compatible 'info_installed'. Returned keys are common to other systems with other package managers
f14f4036df Lint: regexp as a string
cabe863b81 Implement package info function
0668f1da53 Implement getting package installation time
e03716e5b5 Implement getting general packages information
8737d690fe Extract package description
a283d53737 Lintfix the regexp string
fc9c959678 Convert time to ISO 8601
9fb9296276 Return a detailed information about package(s)
PR #27119: (l2ol33rt) Boto dynamodb module should be using layer 2 abstractions @ 2015-09-15 14:09:57 UTC
7f512852ef Merge pull request #27119 from l2ol33rt/boto_dynamo_module_fix
46c7aee367 Boto dynamodb util should be using layer 2 abstractions
PR #27092: (perfinion) salt/master: chdir to root not homedir @ 2015-09-15 14:09:24 UTC
100e340111 Merge pull request #27092 from perfinion/chdir-fix-2015.8
284d268855 salt/master: chdir to root not homedir
PR #27131: (jacobhammons) Install docs @ 2015-09-15 12:34:38 UTC
7483556b5f Merge pull request #27131 from jacobhammons/install-docs
d1e8af9be6 added command to remove key from rhel6
69d64f177d moved rhel5 commands to separate lines
90431278ea Install instruction updates for rhel6 and debian
PR #27124: (jfindlay) Backport #27123 @ 2015-09-15 08:37:43 UTC
PR #27111: (basepi) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2015-09-15 07:29:30 UTC
0d62d3470c Merge pull request #27111 from basepi/merge-forward-2015.8
ab519fb5ff Remove heavily-mocked unit tests
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
59f2a0c7ae Merge pull request #26977 from abh/2015.5-ntppeer
df3d6e817f Add support for PEERNTP network interface configuration on RH derived systems
e05b1f3951 Merge pull request #27023 from jfindlay/htwebutilpass
9f3d7890a6 add test support for htpasswd state mod
9f999c0027 Merge pull request #27074 from twangboy/fix_password_2015.5
fdd3537456 Replaced password with redacted when displayed
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
caab21d99c Merge pull request #27054 from rallytime/bp-27029
0be393be22 Removed check for no package name
0227e1cb57 Merge pull request #27053 from rallytime/bp-26992
83798aff3c Do not use full return for documentation.
d9d5bbaa68 Summary requires full return information.
b72a0ef86d Merge pull request #27052 from rallytime/bp-26930
d9787aa318 aptpkg.mod_repo: Raise when key_url doesn't exist
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
cc2cbf9869 Merge pull request #27070 from stanislavb/2015.5
1e6e5ddc9c Deprecate salt.utils.iam in Carbon
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
843c28b435 Merge pull request #27025 from cachedout/issue_25581
ecc09d9b93 Lint
bfcaab9ef4 Better try and error handling for prep_jid
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
1cdfdf7a92 Merge pull request #27034 from rallytime/softlayer-doc-fix
cb641f8145 Update softlayer docs for where to find apikey
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
9ab2cae1e4 Merge pull request #27027 from rallytime/bp-27013
19a6e9cb1c Remove unwanted debug statement.
2c8beb238f Merge pull request #27026 from rallytime/bp-27011
f8518d545f Move giant eventlisten.sh example out of the state.event docstring
e8cdcc62f7 Merge pull request #26972 from twangboy/fix_20522
0110786fa9 Catch the 404 error from fileclient
fbc95f4685 Merge pull request #26951 from terminalmage/fix-timezone
30a4915762 Update tests to reflect changes to timezone module
b6f926919f Fix timezone module for CentOS
f2ad3c333c Merge pull request #26875 from marccardinal/patch-2
36d5a62262 LXC gateway provisioned only when IP is provided
7b2e7b1b37 Merge pull request #26997 from twangboy/fix_symlink_windows
89cc02d4e0 Added versionadded
835177b0c8 Fixed symlinks for windows (don't use user root)
5389a85894 Merge pull request #27001 from twangboy/fix_reg_docs
2980bbda17 Minor clarification
4684b2ddd1 Added CLI example for reg.delete_key_recursive
37814f5dff Merge pull request #26996 from jacobhammons/beacon-doc
e475ea688e Fixed typo
2401533d9e New content added to beacon docs.
4ba7eed711 Merge pull request #26868 from joejulian/2015.5_lvm_vg_symlink_fix
3dfb33849a Use the actual device name when checking vgdisplay
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
3e902e86b1 Merge pull request #26987 from rallytime/bp-26966
6a29eac003 URL has changed
eddb532713 Merge pull request #26915 from rallytime/joyent-tests
d4ad42d697 Update Joyent Cloud Tests
f86814b2a4 Merge pull request #26971 from rallytime/reactor-doc-fix
0214daad19 Fix a couple of typos in reactor docs
57b1080f94 Merge pull request #26976 from saltstack/revert-26899-fix_26730
6dd54e6bec Revert "file.symlink gets windows account instead of root"
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
20a48f7f2e Merge pull request #26899 from twangboy/fix_26730
9d9b3bb47a file.symlink gets windows account instead of root
dbc6b862f4 Merge pull request #26960 from rallytime/cherrypy-docs
c1420711db Fix bash code block formatting
f733e048c9 Merge pull request #26940 from rallytime/api-doc-fix
00fe6a225c Fix minor doc typo in client api
de9350466e Merge pull request #26871 from rallytime/bp-26852
5a4c8dd2f5 Only reference msgpack if it imported successfully
a563af29d3 Merge pull request #26851 from jacobhammons/doc-bugs
5b1b934192 Merge pull request #26817 from jfindlay/grouparg
82d33939f3 modify groupadd for rhel 5
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
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
a1749b76b8 Merge pull request #26820 from jfindlay/ctlfix
3a2c0d5fbb add default param in _parse_localectl in locale mod
ff733547c4 Merge pull request #26821 from twangboy/fix_26788
cf979e4877 Fixed user.rename function in windows
c892be3255 Merge pull request #26803 from twangboy/fix_26754
23576c65eb Added check for PyMySQL if MySQLdb import fails
6edfa36083 Merge pull request #26815 from jfindlay/linstr
2ff5823944 stringify linode id before performing str actions
PR #27122: (terminalmage) Fix broken link to git-config(1) docs @ 2015-09-15 07:25:05 UTC
886e7bc234 Merge pull request #27122 from terminalmage/fix-broken-link
0b212ea5b3 Fix broken link to git-config(1) docs
PR #27115: (jacobhammons) Release docs @ 2015-09-14 22:19:18 UTC
551bbe70af Merge pull request #27115 from jacobhammons/release-docs
42eaa80997 Restored missing css
9ab642295e Fixed a release notes typo and bad file rename
daa3f4eee0 Updated release notes, change 2015.8 to latest release for doc site
d939a38c8c release notes updates
ISSUE #11993: (UtahDave) salt-cloud -Q output not consistent across providers (refs: #27110)
PR #27110: (rallytime) Make sure -Q output is consistent across salt-cloud drivers @ 2015-09-14 21:48:40 UTC
89c90df909 Merge pull request #27110 from rallytime/fix-11993
c1abc5a19f Remove implied Nones
5d7d357cdd digital_ocean list_nodes function should list public and private ips like other drivers
4b27aef406 Add 'name' to the output of salt-cloud -Q commands, where needed, for consistency.
PR #27050: (twangboy) Turned multiprocessing on @ 2015-09-14 17:34:18 UTC
860de8d877 Merge pull request #27050 from twangboy/fix_minion_conf
7e35b13022 Turned multiprocessing on
PR #27086: (techhat) Document develoment of SPM loader modules @ 2015-09-13 04:52:55 UTC
c78d833540 Merge pull request #27086 from techhat/spmdevdocs
ee0c8955dd Document develoment of SPM loader modules
ISSUE #23125: (bemeyert) Elasticsearch as master_job_cache throws critical (refs: #26941)
PR #26941: (msteed) Make elasticsearch work as master job cache @ 2015-09-12 17:13:44 UTC
25b11759f9 Merge pull request #26941 from msteed/issue-23125
ff88fe402c add versionadded info to save_load() & get_load()
5d2fae8a89 make master job cache index configurable
bc041fa4a7 Merge branch 'issue-23125' of github.com:msteed/salt into issue-23125
9aedc2662e issue-23125
593c4d6b2f issue-23125
PR #27080: (bechtoldt) [Proposal] Add Github SPM label for issues @ 2015-09-12 14:32:58 UTC
b763d0ba52 Merge pull request #27080 from bechtoldt/spm_doc
b9e5095bf5 add GH issue label SPM to docs
PR #27064: (twangboy) Fixed user docs @ 2015-09-11 22:37:19 UTC
cf59a03432 Merge pull request #27064 from twangboy/user_docs
db03ca198e Fixed user docs
PR #27072: (rallytime) Back-port #26840 to 2015.8 @ 2015-09-11 22:35:52 UTC
PR #26840: (deuscapturus) Update http.py (refs: #27072)
71c12cbf46 Merge pull request #27072 from rallytime/bp-26840
d0b9ececa4 Update http.py
PR #27060: (cro) Fix grains breakage when hosts are not Linux, Windows, or SunOS @ 2015-09-11 17:28:49 UTC
0e7555089f Merge pull request #27060 from cro/proxy_grains_breakage
e697326f1b Don't check for proxy in the individual is_linux/is_windows/etc functions. This breaks too many things.
PR #27051: (rallytime) Back-port #26953 to 2015.8 @ 2015-09-11 16:28:20 UTC
PR #26953: (dsumsky) S3 ext_pillar module has broken caching mechanism (refs: #27051)
8ee87b9f61 Merge pull request #27051 from rallytime/bp-26953
eac9d9aba9 Pylint Fix
453440753c - fixed pylint warnings
b40dfa459e - 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 #26864: (terminalmage) Only do git_pillar preflight checks on new-style git_pillar configs @ 2015-09-11 07:47:12 UTC
249f55cd8c Merge pull request #26864 from terminalmage/fix-git_pillar-tests
0b5a653f7c Only do git_pillar preflight checks on new-style git_pillar configs
PR #26967: (TheBigBear) new URL for windows salt downloads @ 2015-09-10 20:51:33 UTC
efaedb8aea Merge pull request #26967 from TheBigBear/patch-4
8d2c042cf7 new URL for windows salt downloads
PR #26921: (terminalmage) Get rid of error in legacy git pillar when using branch mapping notation @ 2015-09-10 20:06:29 UTC
757d3c4eab Merge pull request #26921 from terminalmage/legacy_git_pillar_tests
28e07d5d06 Get rid of error in legacy git pillar when using branch mapping notation
PR #26923: (rallytime) Code clean up of cloud drivers and files @ 2015-09-10 16:37:26 UTC
68eb508e6c Merge pull request #26923 from rallytime/cloud-cleanup
bf33c99b08 Remove redundant parentheses
5045989be7 Make sure function names comply
e327d9a8a4 Remove redundant parens
eee0291ff8 Code clean up of cloud drivers and files
PR #27010: (rallytime) Back-port #26988 to 2015.8 @ 2015-09-10 16:30:30 UTC
PR #26988: (s0undt3ch) Process spm.d/*.conf and add prefix root dir support to SPM directories (refs: #27010)
590c46f4e3 Merge pull request #27010 from rallytime/bp-26988
93b30b5ba8 Whitespace
685fa911e7 Version Added for new apply_spm_config function
9612a6c7ad Process spm.d/*.conf and add prefix root dir support to SPM directories
PR #26985: (rallytime) Fix versionadded tag @ 2015-09-10 16:29:38 UTC
ec185d77fa Merge pull request #26985 from rallytime/versionadded-fix
79eb606cb7 Fix versionadded tag