2015-07-07
Version 2015.5.3 is a bugfix release for 2015.5.0.
Total Merges: 178
Total Issue References: 69
Total PR References: 207
Contributors: 62 (CameronNemo, Lanzaa, Starblade42, The-Loeki, TheScriptSage, aboe76, ahus1, aneeshusa, anlutro, arthurlogilab, basepi, borutmrak, cachedout, cgtx, codertux, cro, dkiser, driskell, eliasp, garethgreenaway, grischa, gthb, heewa, infestdead, jacksontj, jacobhammons, jayeshka, jeanpralo, jfindlay, jodv, joejulian, justinta, kartiksubbarao, kev009, kiorky, lorengordon, msciciel, msteed, nmadhok, notpeter, obestwalter, pengyao, pille, porterjamesj, pruiz, quixoten, rallytime, rhertzog, ruzarowski, ryan-lane, steverweber, tankywoo, tbaker57, techhat, terminalmage, thatch45, thenewwazoo, trevor-h, twangboy, variia, zefrog, zhujinhe)
Generated at: 2018-05-27 21:20:01 UTC
PR #25109: (jfindlay) add 2015.5.3 release notes @ 2015-07-01 19:45:56 UTC
f0f512a4da Merge pull request #25109 from jfindlay/2015.5
3187d5d5aa add 2015.5.3 release notes
PR #25096: (jfindlay) Postgres group test @ 2015-07-01 18:48:26 UTC
ISSUE #25041: (wt) REGRESSION: pillar.get of integer fails to render in sls (refs: #25085)
PR #25085: (jfindlay) accept all sources in the file state @ 2015-07-01 18:23:45 UTC
0a846400c6 Merge pull request #25085 from jfindlay/fix_file
937a252e16 remove unnecessary file state tests
6f238e924c integration test file.managed sources
a5978d30c2 iterate an iterable source othwerise list+str it
PR #25095: (jfindlay) Win groupadd unit tests @ 2015-07-01 18:18:53 UTC
ISSUE #21520: (jfindlay) sudo.salt_call is broken (refs: #25089)
PR #25089: (jfindlay) fix minion sudo @ 2015-07-01 15:53:16 UTC
PR #20226: (thatch45) Allow sudo priv escalation (refs: #25089)
7c8d2a8656 Merge pull request #25089 from jfindlay/fix_sudo
d8f91d4a19 add some apprehension to the sudo exec module
a9269c072a adding sudo exec module docs
e4a40b7bd8 comment whitespace in minion config
44cb167744 adding sudo_user minion config docs
d461060efe adding sudo_user minion config to default
ISSUE #24875: (ahammond) ValueError: list.remove(x): x not in list in File "/usr/lib/python2.6/site-packages/salt/cli/batch.py", line 179, in run active.remove(minion) (refs: #25099)
PR #25099: (driskell) Fix broken batch results @ 2015-07-01 15:51:29 UTC
4d6078e5dd Merge pull request #25099 from driskell/patch-1
59b23e5f6e Fix broken batch results
PR #25083: (steverweber) ipmi: get_sensor_data would always fail @ 2015-06-30 20:57:21 UTC
46350796b6 Merge pull request #25083 from steverweber/fix_ipmi_stat
836f48c378 include _ in IpmiCommand
817e434591 get_sensor_data would always fail
PR #25067: (The-Loeki) Fix for maxdepth=0 in find @ 2015-06-30 20:54:06 UTC
15f2a4077c Merge pull request #25067 from The-Loeki/patch-1
61edad3a80 Fix for maxdepth=0 in find
PR #25078: (terminalmage) Use smaller number for upper limit of mac_user's _first_avail_uid helper function @ 2015-06-30 20:53:24 UTC
58d933cfa8 Merge pull request #25078 from terminalmage/fix-mac-uid
df2ab7ee2b Use smaller number for upper limit of mac_user's _first_avail_uid helper function
ISSUE #24521: (multani) State network.managed fails on Debian (Jessie) (refs: #25045)
PR #25045: (garethgreenaway) Fixes to debian_ip.py in 2015.5 @ 2015-06-30 17:36:43 UTC
ebd6cdc412 Merge pull request #25045 from garethgreenaway/24521_debian_networking
6f2a6c940b having proto default to static since it's needed to build the template.
PR #25065: (lorengordon) Add download links for 2015.5.1-3 and 2015.5.2 Windows installers @ 2015-06-30 15:29:31 UTC
PR #25052: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-06-30 01:05:00 UTC
PR #25038: (jfindlay) versionadded @ 2015-06-29 19:49:27 UTC
PR #24747: (msciciel) add get_route function to network module (refs: #25038) @ 2015-06-29 16:51:43 UTC
28c87cab17 Merge pull request #24747 from msciciel/2015.5
79b4ec2da8 network module lint fix
0b6ef784b2 network module: fix for ipv6
f3d184c478 add get_route function to network module
PR #24975: (ryan-lane) Fix update of undefined env var in npm module @ 2015-06-29 16:45:05 UTC
46a96773aa Merge pull request #24975 from lyft/npm-module-fix
6fde58182f Try byte literals rather than unicode strings in the env
c8514de334 Fix update of undefined env var in npm module
PR #24986: (heewa) Don't modify empty change @ 2015-06-29 16:44:17 UTC
9cf8550cd8 Merge pull request #24986 from heewa/fix-pkg-hold-when-errored
d47a448a80 Don't modify empty change
ISSUE #24969: (bradthurber) salt-cloud 2015.5.0: missing azure dependency results in misleading error (refs: #24999)
PR #24999: (rallytime) Provide a less confusing error when cloud provider is misconfigured @ 2015-06-29 16:43:31 UTC
ece897d8d6 Merge pull request #24999 from rallytime/cloud_error_help
1e81a88625 Clean up
be19a6730e Provide a less confusing error when cloud provider is misconfigured
PR #24987: (heewa) Don't try to cache a template when it's not a file @ 2015-06-29 14:02:59 UTC
4af15cfb90 Merge pull request #24987 from heewa/fix-trying-to-cache-no-file
9ae0c78ffc Don't try to cache a template when it's not a file
PR #25022: (jfindlay) revise label and milestone documentation @ 2015-06-29 13:51:24 UTC
8eeaddbff4 Merge pull request #25022 from jfindlay/label_docs
8575192cc4 revise label and milestone documentation
PR #25029: (jayeshka) adding redismod unit test case. @ 2015-06-29 13:50:33 UTC
89c2e01ac1 Merge pull request #25029 from jayeshka/redismod-unit-test
e3045be5a9 adding redismod unit test case.
PR #24995: (rallytime) Fix deprecated pymongo usage causing errors in latest pymongo @ 2015-06-27 22:28:56 UTC
ISSUE #24862: (dkatsanikakis) gpg.import_key returns error after succesfully completed (refs: #24994, #24966)
PR #24994: (garethgreenaway) Another Fix to gpg.py in 2015.5 @ 2015-06-27 22:28:15 UTC
e9aaa11b68 Merge pull request #24994 from garethgreenaway/2015_5_24862_gpg_import_key
d2f0d8fa96 variable was referenced before assignment. Just removing the variable and checking the return from distutils.version.LooseVersion directly.
PR #24988: (jayeshka) adding states/supervisord unit test case. @ 2015-06-27 22:24:42 UTC
ebd666e5ee Merge pull request #24988 from jayeshka/supervisord-states-unit-test
bb0a6d5625 adding states/supervisord unit test case.
PR #25007: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-06-26 21:28:57 UTC
0487c3c59b Merge pull request #25007 from basepi/merge-forward-2015.5
4980fd547b Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
a11e4c6eea Merge pull request #24944 from techhat/issue24915
59c3081e49 Double-check main_cloud_config
d26a5447ba Merge pull request #24936 from jtand/psutil
bdb7a19c36 Fixed ps module to not use depreciated psutil commands
PR #25003: (jacobhammons) Updated man pages @ 2015-06-26 19:13:41 UTC
91a60e198e Merge pull request #25003 from jacobhammons/man-pages
cf97a4ab17 Updated man pages
PR #25002: (jacobhammons) sphinx html theme updates @ 2015-06-26 18:39:14 UTC
a60a2c4222 Merge pull request #25002 from jacobhammons/doc-announcements
f88f344a28 sphinx html theme updates
PR #24977: (rallytime) Only warn about digital ocean deprecation if digital ocean is configured @ 2015-06-25 23:54:46 UTC
a791b23ff9 Merge pull request #24977 from rallytime/do_move_warning
6b544227ab Only warn about digital ocean deprecation if digital ocean is configured
ISSUE #24862: (dkatsanikakis) gpg.import_key returns error after succesfully completed (refs: #24994, #24966)
PR #24966: (garethgreenaway) Fixes to gpg.py in 2015.5 @ 2015-06-25 19:58:49 UTC
a71c1b7c8b Merge pull request #24966 from garethgreenaway/2015_5_24862_gpg_import_key
55eb73b0c9 fixing unit tests.
80c24be4fe Fixing an issue with the import_key method. Different results depending on which gnupg python module is installed.
ISSUE #24846: (mavenAtHouzz) Memory leak issue in rest_tornado EventListener (refs: #24965)
PR #24965: (jacksontj) Fix memory leak in saltnado @ 2015-06-25 18:48:03 UTC
86221846ac Merge pull request #24965 from jacksontj/2015.5
48b5e1653e pylint
87adca46e0 Fix memory leak in saltnado
PR #24948: (jfindlay) fix some malformed doc links and anchors @ 2015-06-25 15:51:38 UTC
773c4cf8e4 Merge pull request #24948 from jfindlay/doc_links
152a9b2a12 fix some malformed doc links and anchors
ISSUE #24885: (anlutro) Master config - Directories starting with a dot have the dot stripped when root_dir is . (refs: #24886)
PR #24886: (anlutro) Be more careful about stripping away root_dir from directory options @ 2015-06-25 15:50:11 UTC
4ebc01e662 Merge pull request #24886 from alprs/fix-root_dir_bug
52ccafded3 os.sep is the correct directory separator constant
0ecbf261ad Be more careful about stripping away root_dir from directory options
PR #24930: (jacksontj) Don't refetch file templates 100% of the time-- Performance optimization for templated files @ 2015-06-24 21:22:47 UTC
f52f7e1d20 Merge pull request #24930 from jacksontj/2015.5
5fb75346ef Only parse the source if we have one
c03a6fa9d1 Add support for sources of managed files to be local
4cf78a0a95 pylint
d70914e473 Don't refetch the template 100% of the time-- Performance optimization for templated files
PR #24935: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-06-24 18:17:54 UTC
ISSUE #24826: (rakai93) rh_service.py: 'int' object has no attribute 'startswith' (refs: #24873)
PR #24873: (jfindlay) convert osrelease grain to str before str op @ 2015-06-24 16:43:08 UTC
4e8ed0d8ed Merge pull request #24873 from jfindlay/rh_service
febe6efab7 convert osrelease grain to str before str op
PR #24923: (jayeshka) adding states/status unit test case. @ 2015-06-24 15:50:07 UTC
90819f9c37 Merge pull request #24923 from jayeshka/status-states-unit-test
baec650674 adding states/status unit test case.
PR #24902: (cro) Fix minion failover, document same @ 2015-06-24 15:20:43 UTC
2dd24ece71 Merge pull request #24902 from cro/fixfo2
90c73ff446 References to documentation.
f0c9204d8b Add references to failover parameters in conf
9da96a8b95 Docs
e2314f0e49 Move comment.
b9a756ff5f Fix master failover and add documentation for same. Factor in syndics. Syndics will not failover (yet).
PR #24926: (rallytime) Back-port #22263 to 2015.5 @ 2015-06-24 15:09:40 UTC
PR #24900: (rallytime) Back-port #24848 to 2015.5 @ 2015-06-24 15:09:18 UTC
PR #24899: (rallytime) Back-port #24847 to 2015.5 @ 2015-06-24 15:09:01 UTC
PR #24898: (rallytime) Back-port #24845 to 2015.5 @ 2015-06-24 15:06:09 UTC
PR #24845: (porterjamesj) fix bug in docker.loaded (refs: #24898)
d4dd8d288d Merge pull request #24898 from rallytime/bp-24845
071049ae7a fix bug in docker.loaded
ISSUE #24799: (infestdead) Forced remount because options changed when no options changed (glusterfs) (refs: #24839)
PR #24897: (rallytime) Back-port #24839 to 2015.5 @ 2015-06-24 15:05:35 UTC
PR #24891: (jayeshka) adding states/ssh_known_hosts unit test case. @ 2015-06-23 16:46:58 UTC
1650233be9 Merge pull request #24891 from jayeshka/ssh_known_hosts-states-unit-test
ef1347f2b3 adding states/ssh_known_hosts unit test case.
ISSUE #24870: (dkiser) salt-cloud fails on sudo password prompt when using ssh key to auth (refs: #24874)
PR #24874: (dkiser) Fix for salt-cloud when ssh key used to auth and using sudo. @ 2015-06-22 23:46:08 UTC
ISSUE #24871: (dkiser) salt-cloud fails to honor 'password' in cloud options before raising an exception (refs: #24880)
PR #24880: (dkiser) Fix to allow password for salt-cloud to be set outside of a vm specif… @ 2015-06-22 23:44:59 UTC
ddaa21c0ae Merge pull request #24880 from dkiser/salt-cloud-24871
4f6c035673 Fix to allow password for salt-cloud to be set outside of a vm specific context.
PR #24852: (pruiz) Fix issue 24851: regular expression so it now matches packages with '.' or '-' at pkg name @ 2015-06-22 20:37:13 UTC
3902b162a9 Merge pull request #24852 from pruiz/issue-24851
73adb1df50 Fix regular expression so it now matches packages with '.' or '-' at pkg name.
PR #24861: (jayeshka) adding states/ssh_auth unit test case. @ 2015-06-22 16:20:01 UTC
6c5b788afd Merge pull request #24861 from jayeshka/ssh_auth-states-unit-test
e5d7b0de80 adding states/ssh_auth unit test case.
ISSUE #23478: (calvinhp) grains.get virtual reports "physical" on bhyve FreeBSD VM (refs: #24824)
PR #24824: (kev009) Detect bhyve virtual type for FreeBSD guests @ 2015-06-22 15:24:35 UTC
9e3321c18e Merge pull request #24824 from kev009/grains-bhyve-bsd
a2262097a1 Detect bhyve virtual type for freebsd guests
ISSUE #24746: (anlutro) state.apply doesn't seem to work (refs: #24795)
PR #24795: (anlutro) Fix state.apply for salt-ssh @ 2015-06-22 15:23:57 UTC
7b07ef9f44 Merge pull request #24795 from alprs/fix-salt_ssh_state_apply
905840b1fa Fix state.apply for salt-ssh
PR #24832: (jacksontj) Don't incur a "_load_all" of the lazy_loader while looking for mod_init. @ 2015-06-22 15:17:10 UTC
PR #20540: (jacksontj) Loader nomerge: Don't allow modules to "merge" (refs: #24832)
PR #20481: (jacksontj) Add submodule support to LazyLoader (refs: #20540)
PR #20473: (jacksontj) Add "disabled" support (refs: #20481)
PR #20274: (jacksontj) Loader overhaul to LazyLoader (refs: #20473)
PR #12327: (jacksontj) Add a LazyLoader class which will lazily load modules (with the given lo... (refs: #20274)
31d4c131e9 Merge pull request #24832 from jacksontj/2015.5
cfa7c0a699 pylint
be18439736 Don't incur a "_load_all" of the lazy_loader while looking for mod_init.
ISSUE #14666: (luciddr34m3r) salt-cloud GoGrid exception when using map file (refs: #24811)
PR #24834: (rallytime) Back-port #24811 to 2015.5 @ 2015-06-19 18:43:49 UTC
PR #24790: (rallytime) Back-port #24741 to 2015.5 @ 2015-06-19 17:25:58 UTC
PR #24741: (CameronNemo) Improve Upstart enable/disable handling (refs: #24790)
d2edb63cff Merge pull request #24790 from rallytime/bp-24741
a54245f080 Add missing import
4ce6370d6e salt.modules.upstart: fix lint errors
aec53ec32a Improve Upstart enable/disable handling
PR #24789: (rallytime) Back-port #24717 to 2015.5 @ 2015-06-19 17:17:00 UTC
PR #24823: (jayeshka) adding states/splunk_search unit test case. @ 2015-06-19 17:14:12 UTC
0a6c70f062 Merge pull request #24823 from jayeshka/splunk_search-states-unit-test
98831a8cb0 adding states/splunk_search unit test case.
PR #24809: (jodv) Correctly create single item list for failover master type with string value for master opt @ 2015-06-19 15:22:20 UTC
4c5a708599 Merge pull request #24809 from jodv/single_item_master_list
18ceebc77f single item list vs. list of characters
PR #24802: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-06-18 20:11:58 UTC
ae05e70e94 Merge pull request #24802 from basepi/merge-forward-2015.5
5b7a65d6d9 Merge pull request #19 from twangboy/merge-forward-fixes
98e7e90299 Fixed test failures for Colton
b949856ae6 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
4281dfff0b Merge pull request #24780 from nmadhok/backport-2014.7-24777
c53b0d9a22 Backporting PR #24777 to 2014.7 branch
f3c5cb2d41 Merge pull request #24769 from msteed/issue-21318
f40a9d5cc0 Fix stacktrace in get_cli_returns()
59db24602f Merge pull request #24690 from twangboy/fix_17041
7a015389af Added additional reporting
d84ad5d519 Fixed capitalization... Failed and Already
e9552455c4 Merge branch '2014.7' of https://github.com/saltstack/salt into fix_17041
144bff2f67 Report powershell output instead of error
PR saltstack/salt#24329: (jayeshka) adding states/postgres_database unit test case. (refs: #24798)
PR #24798: (justinta) Revert "adding states/postgres_database unit test case." @ 2015-06-18 17:56:17 UTC
daa76c34e4 Merge pull request #24798 from saltstack/revert-24329-postgres_database-states-unit-test
179ce03d93 Revert "adding states/postgres_database unit test case."
PR #24791: (rallytime) Back-port #24749 to 2015.5 @ 2015-06-18 17:43:15 UTC
PR #24749: (obestwalter) add windows specfic default for multiprocessing (refs: #24791)
7073a9f850 Merge pull request #24791 from rallytime/bp-24749
be43b2b394 add windows specfic default for multiprocessing
PR #24792: (rallytime) Back-port #24757 to 2015.5 @ 2015-06-18 15:58:35 UTC
PR #24768: (jfindlay) fix yum versionlock on RHEL/CentOS 5, disable corresponding test @ 2015-06-18 15:13:12 UTC
0f9298263b Merge pull request #24768 from jfindlay/pkg_mod
7a26c2b5b9 disable pkg.hold test for RHEL/CentOS 5
4cacd93c22 use correct yum versionlock pkg name on centos 5
ISSUE #24776: (nmadhok) --static option in salt raises ValueError and has been broken for a very long time (refs: #24777)
PR #24778: (nmadhok) Backporting PR #24777 to 2015.2 branch (refs: #24777) @ 2015-06-18 14:53:04 UTC
PR #24774: (zefrog) Fix lxc lvname parameter command @ 2015-06-18 14:49:06 UTC
2a4f65f3f7 Merge pull request #24774 from zefrog/fix-lxc-lvname-param
21e0cd4a5e Fixed typo in lxc module: lvname parameter typo
283d86ec12 Fixed bug in lxc module: lvname using wrong parameter in cmd
PR #24782: (jayeshka) adding states/slack unit test case. @ 2015-06-18 14:33:55 UTC
fd7339014b Merge pull request #24782 from jayeshka/slack-states-unit-test
e2b6214764 adding states/slack unit test case.
ISSUE #24770: (jacksontj) Requisite and Requisite_in don't play nice together (refs: #24771)
PR #24771: (jacksontj) Always extend requisites, instead of replacing them @ 2015-06-18 14:29:09 UTC
c9c90af512 Merge pull request #24771 from jacksontj/2015.5
b1211c5422 Re-enable tests for complex prereq and prereq_in
378f6bfc36 Only merge when the merge is of requisites
PR #24766: (msteed) Remove doc references to obsolete minion opt @ 2015-06-17 21:36:55 UTC
5fe4de8f62 Merge pull request #24766 from msteed/undoc-dns_check
f92a769d35 Remove doc references to obsolete minion opt
PR #24329: (jayeshka) adding states/postgres_database unit test case. @ 2015-06-17 19:11:02 UTC
a407ab7c51 Merge pull request #24329 from jayeshka/postgres_database-states-unit-test
ee06f1ad57 adding states/postgres_database unit test case.
ISSUE #24560: (hydrosine) Documentation missing on parameter (refs: #24632)
ISSUE #24547: (dragonpaw) Artifactory docs say module is 'jboss7'. (refs: #24632)
ISSUE #24375: (companykitchen-dev) Custom grain won't sync under any circumstances (refs: #24632)
ISSUE #24275: (kartiksubbarao) augeas issue with apache and recognizing changes that have been already made (refs: #24632)
ISSUE #24163: (tbaker57) enable_gpu_grains default value confusion (refs: #24632)
PR #24632: (jacobhammons) Doc bug fixes @ 2015-06-17 18:40:02 UTC
ISSUE #24198: (ahammond) salt-call event.send doesn't send events from minion (refs: #24607)
PR #24607: (garethgreenaway) fixes to minion.py @ 2015-06-17 18:16:42 UTC
PR #24755: (rallytime) Remove SALT_CLOUD_REQS from setup.py @ 2015-06-17 17:42:25 UTC
bf2dd94389 Merge pull request #24755 from rallytime/fix_setup_15
48769a544d Remove SALT_CLOUD_REQS from setup.py
PR #24740: (rallytime) Backport #24720 to 2015.5 @ 2015-06-17 16:43:37 UTC
PR #24720: (TheScriptSage) Issue 24621 - AD/LDAP Group Auth Issue (refs: #24740)
3d53d79476 Merge pull request #24740 from rallytime/bp-24720
a9bcdb5b77 Updating master.py to properly check against groups when user is only authed against group. Tested against unit.auth_test.
PR #24723: (rallytime) Back-port #20124 to 2015.5 @ 2015-06-17 16:43:20 UTC
PR #20124: (cgtx) add init system to default grains (refs: #24723)
ac2851be55 Merge pull request #24723 from rallytime/bp-20124
4d0061b832 fix infinite loop introduced by #20124 when the init system is not in the supported_inits list
0c7fa0fca2 Optimizations for #20124
f353454327 add init system to default grains (resolve #20124)
PR #24754: (anlutro) salt-cloud documentation - Add information about linode location @ 2015-06-17 16:04:48 UTC
78cd09b6e9 Merge pull request #24754 from alprs/docs-add_linode_location_option
d88e071e98 add information about linode location
PR #24748: (jayeshka) adding states/serverdensity_device unit test case. @ 2015-06-17 15:39:07 UTC
d5554f76ec Merge pull request #24748 from jayeshka/serverdensity_device-states-unit-test
1a4c241050 adding states/serverdensity_device unit test case.
PR #24739: (rallytime) Back-port #24735 to 2015.5 @ 2015-06-17 15:16:47 UTC
ISSUE #24111: (yermulnik) cli option '--summary' got broken after upgrade to 2015.5.1 (refs: #24732)
PR #24732: (msteed) Fix stacktrace when --summary is used @ 2015-06-17 03:27:57 UTC
c8713f2d00 Merge pull request #24732 from msteed/issue-24111
54b33dd359 Fix stacktrace when --summary is used
PR #24721: (rallytime) Back-port #24668 to 2015.5 @ 2015-06-17 03:23:47 UTC
PR #24668: (grischa) enable virtual package names in pyobjects renderer (refs: #24721, #24757)
70d37816bf Merge pull request #24721 from rallytime/bp-24668
68fb5af970 fixing other test
ba4f262b9c fixing text for virtual support in pyobjects
b349d91a5f enable virtual package names in pyobjects renderer
ISSUE #21923: (Fluro) Salt cloud not running provisioning script as root (refs: #24718)
ISSUE #17241: (hasues) Salt-Cloud for vSphere needs additional documentation (refs: #24718)
PR #24718: (rallytime) Added some missing config documentation to the vsphere driver @ 2015-06-17 03:19:35 UTC
1b9d6895c7 Merge pull request #24718 from rallytime/update_vsphere_docs
bfdebb6e18 Added some missing config documentation to the vsphere driver
PR #24714: (rallytime) Remove cloud-requirements.txt @ 2015-06-17 03:17:04 UTC
64857c706d Merge pull request #24714 from rallytime/remove_cloud_reqs_15
67b796d01e Remove cloud-requirements.txt
ISSUE #24439: (bechtoldt) Add tornado version to versions report (refs: #24733)
PR #24733: (msteed) Include Tornado in versions report @ 2015-06-17 03:13:53 UTC
f96b1d68cd Merge pull request #24733 from msteed/issue-24439
76cfef05ec Include Tornado in versions report
PR #24737: (jacksontj) Move AES command logging to trace @ 2015-06-17 01:48:11 UTC
a861fe0f4f Merge pull request #24737 from jacksontj/2015.5
a4ed41ae82 Move AES command logging to trace
PR #24724: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-06-16 22:46:27 UTC
PR #24701: (jayeshka) adding states/selinux unit test case. @ 2015-06-16 15:27:29 UTC
3d33fe7676 Merge pull request #24701 from jayeshka/selinux-states-unit-test
0c136fd9c2 adding states/selinux unit test case.
PR #24687: (cachedout) Note about minimum worker_threads @ 2015-06-15 20:46:23 UTC
2e287a9e33 Merge pull request #24687 from cachedout/min_worker_threads
b7bb7eaeb2 Note about minimum worker_threads
PR #24688: (cachedout) Update AUTHORS @ 2015-06-15 20:46:03 UTC
432478ccb7 Merge pull request #24688 from cachedout/update_authors
3f6880e291 Better email
6c7b773eae Update AUTHORS
ISSUE #22385: (cachedout) States which require unavailable modules should display the reason (refs: #24649)
PR #24649: (cachedout) Improved error reporting for failed states @ 2015-06-15 16:04:20 UTC
9a2b50d59f Merge pull request #24649 from cachedout/issue_22385
b9fe792534 States will now return the reason behind failure if a module could not be loaded
PR #24673: (jayeshka) adding states/schedule unit test case. @ 2015-06-15 15:24:52 UTC
66e9e16753 Merge pull request #24673 from jayeshka/schedule-states-unit-test
54aaaa5f12 adding states/schedule unit test case.
ISSUE #24661: (kartiksubbarao) augeas.change doesn't support setting empty values (refs: #24663)
PR #24663: (kartiksubbarao) Update augeas_cfg.py @ 2015-06-15 15:18:48 UTC
5eb19c4e4d Merge pull request #24663 from kartiksubbarao/patch-2
e18db50e0c Update augeas_cfg.py
ISSUE #24583: (dkiser) salt-cloud keyring password referenced before assignment (refs: #24667)
PR #24667: (dkiser) fix for #24583 clouds/openstack.py kerying first time succeeds @ 2015-06-14 21:58:58 UTC
ISSUE #24537: (kartiksubbarao) alias.present doesn't update alias values that are substrings of the existing value (refs: #24659)
PR #24659: (kartiksubbarao) Update aliases.py @ 2015-06-13 17:31:42 UTC
4c64ee9d94 Merge pull request #24659 from kartiksubbarao/patch-1
d6834749e2 Update aliases.py
PR #24644: (cro) Merge forward 2014.7->2015.5 @ 2015-06-12 21:31:41 UTC
89eb616c29 Merge pull request #24644 from cro/2014.7-2015.5-20150612
4136dc3160 Merge forward from 2014.7 to 2015.5
b99484fde2 Merge pull request #24643 from cro/saltannounce
ecb0623d7f Add salt-announce mailing list.
635121e85d Merge pull request #24620 from twangboy/fix_24215
d7a9999be1 Fixed comment and uncomment functions in file.py
PR saltstack/salt#24595: (tankywoo) fix target rule, remove unneeded quotation mark (refs: #24642)
PR #24642: (basepi) Revert "fix target rule, remove unneeded quotation mark" @ 2015-06-12 20:14:26 UTC
b896a0d0e9 Merge pull request #24642 from saltstack/revert-24595-fix-iptables-target
5ff3224ae1 Revert "fix target rule, remove unneeded quotation mark"
PR #24628: (jayeshka) adding states/reg unit test case. @ 2015-06-12 17:29:11 UTC
01092c2337 Merge pull request #24628 from jayeshka/reg_states-unit-test
af1bd8f9ff adding states/reg unit test case.
ISSUE #24494: (arount) Computed comments in jinja states (refs: #24591)
ISSUE #23359: (BalintSzigeti) init.sls parsing issue (refs: #24591)
ISSUE #21217: (Colstuwjx) Maybe a bug for jinja render? (refs: #24591)
PR #24631: (rallytime) Back-port #24591 to 2015.5 @ 2015-06-12 16:54:32 UTC
PR #24591: (tbaker57) Add some documentation surrounding Jinja vs yaml comments - (refs: #24631)
5f491f911d Merge pull request #24631 from rallytime/bp-24591
f13cd418bc Add extra clarification why jinja comments are needed.
23749718bb Fix typo
6a917471d4 Add some documentation surrounding Jinja comments - refs #24492, #21217, #23359
PR #24616: (garethgreenaway) additional logging in state.py module @ 2015-06-12 16:25:39 UTC
f23f99ec35 Merge pull request #24616 from garethgreenaway/2015_5_logging_disabled_states
4dbf0ef160 Adding some logging statement to give feedback when states, including highstate, are disabled. Useful when running from scheduler.
PR #24595: (tankywoo) fix target rule, remove unneeded quotation mark @ 2015-06-12 16:23:22 UTC
6dccbb04a1 Merge pull request #24595 from tankywoo/fix-iptables-target
10a5160d7c fix target rule, remove unneeded quotation mark
PR #24604: (jfindlay) fix pkg module integration tests @ 2015-06-12 16:04:26 UTC
8ac3d94785 Merge pull request #24604 from jfindlay/pkg_tests
d88fb22fdc fix pkg module integration tests on CentOS 5
fb91b40ba0 fix pkg module integration tests on ubuntu 12
PR #24600: (basepi) [2015.5] Remove __kwarg__ from salt-ssh keyword args @ 2015-06-12 04:21:29 UTC
0ff545c549 Merge pull request #24600 from basepi/salt-ssh.orchestrate.20615
9b55683f6a Remove __kwarg__ from salt-ssh keyword args
ISSUE #22843: (Xiol) salt-ssh roster doesn't support integers as host keys (refs: #24608)
PR #24608: (basepi) [2015.5] Normalize salt-ssh flat roster minion IDs to strings @ 2015-06-11 21:35:07 UTC
832916f49f Merge pull request #24608 from basepi/salt-ssh.flat.roster.integers.22843
381820f051 Normalize salt-ssh flat roster minion IDs to strings
PR #24605: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-06-11 19:15:21 UTC
ISSUE #24457: (ryan-lane) When selecting the version of docs on the docs site, it brings you to the homepage (refs: #24598)
ISSUE #24250: (jfindlay) have version links on docs page link to that version of the current page (refs: #24598)
PR #24598: (jacobhammons) 2015.5.2 release changes @ 2015-06-11 17:24:11 UTC
ISSUE #20615: (aurynn) 2014.7.1: salt/states/saltmod using incorrect return dict for orchestrate (refs: #24588)
PR #24588: (basepi) Fixes for saltmod.function for salt-ssh @ 2015-06-11 16:15:21 UTC
26930b45bd Merge pull request #24588 from basepi/salt-ssh.orchestrate.20615
826936ce57 Move documentation into docstring instead of comments
de052e7135 Assign 'return' to 'ret' if necessary in saltmod.function
34ff989d66 Convert keyword args to key=value strings in salt-ssh
PR #24593: (jayeshka) adding states/redismod unit test case. @ 2015-06-11 15:55:27 UTC
5a21ad152e Merge pull request #24593 from jayeshka/redismod_states-unit-test
3b95744840 adding states/redismod unit test case.
PR #24581: (rallytime) Disabled some flaky tests until we can figure out how to make them more reliable @ 2015-06-11 15:51:41 UTC
PR #24217: (jfindlay) disable intermittently failing tests (refs: #24581)
PR #23623: (jfindlay) Fix /jobs endpoint's return (refs: #24217)
PR #22857: (jacksontj) Fix /jobs endpoint's return (refs: #23623)
8ffb86edd0 Merge pull request #24581 from rallytime/disable_some_flaky_tests
c82f135d2e Disabled some flaky tests until we can figure out how to make them more reliable
PR #24566: (jayeshka) adding states/rdp unit test case. @ 2015-06-11 02:14:39 UTC
a570d7f967 Merge pull request #24566 from jayeshka/rdp_states-unit-test
273b994e91 adding states/rdp unit test case.
ISSUE #24480: (kiorky) [CRITICAL] [2015.5] tls breaks tzinfo (refs: #24551)
PR #24551: (joejulian) 2015.5 dont pollute environment @ 2015-06-11 02:13:06 UTC
20ada1f8a1 Merge pull request #24551 from joejulian/2015.5_dont_pollute_environment
cfc3b43ba2 Don't pollute the TZ environment variable
cba8d3f923 pep8
9cb7015568 Mark keyword version adds
76e2583265 Merge tls changes from develop
ISSUE #19901: (clinta) State cache is not documented (refs: #24574, #24468)
PR #24574: (jacobhammons) Refs #19901 @ 2015-06-10 20:09:23 UTC
PR #24577: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-06-10 19:46:22 UTC
b03166cde3 Merge pull request #24577 from basepi/merge-forward-2015.5
e1d45ccf3b Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
d376390f76 Merge pull request #24530 from twangboy/fix_24427
673e1d809e Added missing panel.bmp for installer
cc50218b01 Start Minion Service on Silent Install
ISSUE #24235: (tomasfejfar) Difference between running from minion and from master (refs: #24571, #24468)
PR #24571: (jacobhammons) Refs #24235 @ 2015-06-10 17:02:18 UTC
PR #24565: (pille) fix backtrace, when listing plugins @ 2015-06-10 16:33:11 UTC
fe07eb5653 Merge pull request #24565 from pille/munin-ignore-broken-symlinks
8511a6c0a6 fix backtrace, when listing plugins
PR #24554: (ryan-lane) Fix yes usage for pecl defaults @ 2015-06-09 23:59:49 UTC
251c8f9f5f Merge pull request #24554 from lyft/pecl-module-fix
56a9cfcf24 Fix yes usage for pecl defaults
PR #24535: (rallytime) Back-port #24518 to 2015.5 @ 2015-06-09 20:06:18 UTC
PR #24518: (rallytime) Merge #24448 with Pylint Fixes (refs: #24535)
PR #24448: (codertux) Update modules path for operating systems using systemd (refs: #24518)
dbd49b4acb Merge pull request #24535 from rallytime/bp-24518
fc75197616 Pylint fix
3e08840988 Update modules path for operating systems using systemd
PR #24538: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-06-09 17:27:20 UTC
PR #24495: (jayeshka) adding states/rabbitmq_vhost unit test case. @ 2015-06-09 15:33:23 UTC
73e6388acd Merge pull request #24495 from jayeshka/rabbitmq_vhost_states-unit-test
31889e38eb cosmetic change.
cf501cf60d resolved error.
4bb6087722 Merge branch '2015.5' of https://github.com/saltstack/salt into rabbitmq_vhost_states-unit-test
3ad77143a8 adding states/rabbitmq_vhost unit test case.
PR #24445: (jayeshka) adding states/pyrax_queues unit test case. @ 2015-06-09 15:28:45 UTC
bf1abccebe Merge pull request #24445 from jayeshka/pyrax_queues_states-unit-test
ea27cefb10 adding states/pyrax_queues unit test case.
PR #24490: (aneeshusa) Fix pacman.list_upgrades for new python_shell default. @ 2015-06-09 15:13:16 UTC
0247e8d10d Merge pull request #24490 from aneeshusa/fix-pacman-list-upgrades
980e1cb4dc Lint fix.
dca33f1112 Fix pacman.list_upgrades for new python_shell default.
PR #24517: (steverweber) small fixes to the ipmi docs @ 2015-06-09 15:10:14 UTC
6268ddb43a Merge pull request #24517 from steverweber/ipmi_doc
6413712844 lint
e78aea9b01 more small fixes to the ipmi docs
PR #24524: (jayeshka) any() takes list oy tuple. @ 2015-06-09 13:49:42 UTC
3728b3f327 Merge pull request #24524 from jayeshka/rabbitmq_vhost_states-module
01c99ad767 any() takes list oy tuple.
PR #24482: (eliasp) 'docker.running' needs now the 'image' param. @ 2015-06-09 04:43:04 UTC
dd23de885b Merge pull request #24482 from eliasp/2015.5-states.dockerio-docker.running-doc
5de741d626 'docker.running' needs now the 'image' param.
ISSUE #23503: (jfindlay) salt-ssh fails on CentOS 7 when python-zmq is not installed (refs: #24515)
PR #24515: (basepi) [2015.5] Add xml library to the salt-thin @ 2015-06-09 04:10:06 UTC
2a727c3f55 Merge pull request #24515 from basepi/susexml23503
078b33eaaf Add xml library to the thin
PR #24497: (jayeshka) adding states/rbenv unit test case. @ 2015-06-09 03:56:10 UTC
fce998a58b Merge pull request #24497 from jayeshka/rbenv_states-unit-test
79d343a62b adding states/rbenv unit test case.
PR #24496: (jayeshka) adding states/rabbitmq_user unit test case. @ 2015-06-09 03:55:23 UTC
2bcb4b1eed Merge pull request #24496 from jayeshka/rabbitmq_user_states-unit-test
7d96f27f91 adding states/rabbitmq_user unit test case.
PR #24481: (eliasp) Fix typo (licnese → license). @ 2015-06-09 03:30:25 UTC
02a597bf49 Merge pull request #24481 from eliasp/2015.5-salt.states.powerpath-license_typo
1280054bce Fix typo (licnese → license).
PR #24467: (thenewwazoo) Fix dockerio bound volumes @ 2015-06-09 01:40:23 UTC
5ad3db5ffb Merge pull request #24467 from thenewwazoo/fix-dockerio-bound-volumes
db4e3dc69b Let's raise an exception if create fails
d1d85dd685 Add logging
ddc63f0f30 Fix volume handling when creating containers
PR #24504: (rallytime) Move vsphere deprecation to 2015.5 @ 2015-06-08 22:43:05 UTC
PR #24506: (rallytime) Backport #24450 to 2015.5 @ 2015-06-08 22:42:14 UTC
PR #24450: (ruzarowski) Fix salt cli runs with batch-size set (refs: #24506)
cb5546085c Merge pull request #24506 from rallytime/bp-24450
1c0fca2b9d Backport #24450 to 2015.5
PR #24498: (rallytime) Added "CLI Example" to make failing test happy on 2015.5 @ 2015-06-08 15:48:40 UTC
3173fd17ad Merge pull request #24498 from rallytime/fix_doc_failure_fifteen
d992ef4777 Added "CLI Example" to make failing test happy on 2015.5
PR #24471: (anlutro) Set up salt-ssh file logging @ 2015-06-08 15:26:49 UTC
3639e411bd Merge pull request #24471 from alprs/fix-salt_ssh_logging
6a11ec87b8 set up salt-ssh file logging
PR #24469: (jfindlay) correctly handle user environment info for npm @ 2015-06-08 15:26:02 UTC
551e70f3fb Merge pull request #24469 from jfindlay/npm_env
8140c96949 update npm's user info envs
cb572f8c41 add env parameter to npm.uninstall
ISSUE #24268: (tkent-xetus) Ability to specify revision for win_gitrepos undocumented (refs: #24468)
ISSUE #24235: (tomasfejfar) Difference between running from minion and from master (refs: #24571, #24468)
ISSUE #24193: (abng88) Update ext_pillar docs to mention that this feature is supported masterless as well (refs: #24468)
ISSUE #24172: (zhujinhe) Can lists be passed in the pillar on the command line on version 2015.5.0? (refs: #24468)
ISSUE #23211: (lloesche) Document that salt://| escapes special characters in filenames (refs: #24468)
ISSUE #19901: (clinta) State cache is not documented (refs: #24574, #24468)
ISSUE #19801: (ksalman) How are grains static? (refs: #24468)
PR #24468: (jacobhammons) Bug fixes and build errors @ 2015-06-08 15:25:40 UTC
ISSUE #24318: (favadi) uncaught exception for pkgrepo.absent for invalid PPA (refs: #24465)
PR #24465: (jfindlay) catch exception from softwarerepositories @ 2015-06-08 15:25:19 UTC
be6905a545 Merge pull request #24465 from jfindlay/unknown_ppa
19c912866d catch exception from softwarerepositories
ISSUE #24296: (objectx) mount.mount calls file.mkdir with incorrect named argument (refs: #24464)
PR #24464: (jfindlay) fix typo in modules/mount.py @ 2015-06-08 15:25:07 UTC
58d1ea8fe8 Merge pull request #24464 from jfindlay/file_mkdir
6e8cd44500 fix typo in modules/mount.py
ISSUE #24434: (dkiser) multimaster failover fails due to logic from issue #23611 (refs: #24461)
PR #24461: (dkiser) fix for #24434 @ 2015-06-08 15:24:53 UTC
PR #24479: (ahus1) change "path" to "name" for "file" operations @ 2015-06-07 17:56:11 UTC
8917416d39 Merge pull request #24479 from ahus1/patch-1
7d6b60c79d change "path" to "name" for "file" operations
PR #24475: (rallytime) Back-port #24454 to 2015.5 @ 2015-06-07 01:29:32 UTC
ISSUE #24407: (aboe76) Please expand salt module random (refs: #24420)
PR #24474: (rallytime) Back-port #24420 to 2015.5 @ 2015-06-07 01:29:11 UTC
ISSUE #24233: (variia) yumpkg.group_install keeps returning state change
PR #24472: (variia) ensure {} output is not treated as change in module.py state, fixes #… @ 2015-06-06 14:45:44 UTC
ISSUE #8585: (UtahDave) '#' in single quoted option on cli not making it into the execution module (refs: #24466)
ISSUE #18045: (dstokes) Pillar kwargs parse error with # (refs: #24466)
PR #24466: (basepi) [2015.5] Fix for # in inner strings in yaml arguments @ 2015-06-06 14:35:56 UTC
0292e67c8a Merge pull request #24466 from basepi/fixhashinargs18045
2e0609f09e Fix for # in inner strings in yaml arguments
PR #24456: (rallytime) Back-port #24441 to 2015.5 @ 2015-06-05 22:32:25 UTC
PR #24441: (arthurlogilab) [doc] Alignement fix on external_auth documentation (refs: #24456)
ced558a6e6 Merge pull request #24456 from rallytime/bp-24441
70028553c1 yaml indentations should be 2 spaces
21b51abf25 [doc] Alignement fix on external_auth documentation
ISSUE #24397: (kiorky) on debian: states.apt should use virtualname as it shadows system apt module (refs: #24398, #24400, #24399)
PR #24398: (kiorky) VirtualName for states.apt (refs: #24399) @ 2015-06-05 17:40:04 UTC
c0ff4110ab Merge pull request #24398 from makinacorpus/aptv
785d27707f VirtualName for states.apt
PR #24447: (jayeshka) adding states/rabbitmq_policy unit test case. @ 2015-06-05 15:26:11 UTC
36263405be Merge pull request #24447 from jayeshka/rabbitmq_policy_states-unit-test
9b038abd63 adding states/rabbitmq_policy unit test case.
PR #24446: (jayeshka) adding states/rabbitmq_plugin unit test case. @ 2015-06-05 15:25:33 UTC
8445a3f28d Merge pull request #24446 from jayeshka/rabbitmq_plugin_states-unit-test
cb0c99a012 adding states/rabbitmq_plugin unit test case.
PR #24426: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-06-05 03:59:11 UTC
9cc3808758 Merge pull request #24426 from basepi/merge-forward-2015.5
eafa20cdfb Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
83f853b6ea Merge pull request #24405 from jacksontj/2014.7
2c7afaeebf Fix for #24276
cef919c602 Merge pull request #24395 from hvnsweeting/handle-exception-get-file
bb798a0224 handle exceptions when received data is not in good shape
efba1a94b4 Merge pull request #24305 from twangboy/win_path_docs
36804253e6 Fixed pylint error caused by P... added r
bc42a4bb11 triple double quotes to triple single quotes
77cd930bba Added documentation, fixed formatting
ISSUE #24309: (steverweber) missing docs (refs: #24429)
PR #24429: (jacobhammons) Salt cloud doc updates, build errors and bug fixes @ 2015-06-05 00:27:38 UTC
PR #24408: (rallytime) Backport #24392 to 2015.5 @ 2015-06-04 20:22:09 UTC
PR #24380: (rallytime) Backport #24357 to 2015.5 @ 2015-06-04 20:13:51 UTC
ISSUE #24358: (pengyao) Netapi SSH client don't support ssh_user and ssh_passwd arguments (refs: #24388)
ISSUE #22958: (highlyunavailable) Weird error when typoing a command (refs: #24367)
PR #24367: (terminalmage) Improve error message when module does not exist @ 2015-06-04 20:07:12 UTC
72d2eaeda9 Merge pull request #24367 from terminalmage/issue22958
d0d7a5481c Improve error message when module does not exist
ISSUE #23101: (gravyboat) Create a docs page for labels (refs: #23387)
PR #24412: (jfindlay) backport #23387 @ 2015-06-04 20:06:03 UTC
PR #23387: (rallytime) Add some "What are all these labels for?" documentation (refs: #24412)
a628778e3c Merge pull request #24412 from jfindlay/bp-23387
bf85772042 Make sure the parameters are in the correct order
9f53809cde Add "* Change" label parameters
b27a15e774 Remove "workaround" wording
9fff35a959 Some small fixes
54a7089fd6 Link the new labels doc in contributing and hacking docs
375695e696 Add pull request label definitions
de945638d3 Add Feature Request label definition
684f291bd4 Add issue definition and augment functional areas section
2da13dd525 Start a "what are all of these labels for?" doc
ISSUE #24154: (ssgward) Exception when running cp.get_url (refs: #24336)
PR #24336: (twangboy) Added line to give more descriptive error @ 2015-06-04 19:56:00 UTC
485116c2cc Merge pull request #24336 from twangboy/fix_cp_get_url
37b11f931c Added line to give more descriptive error
PR #24413: (techhat) Add more namespaced functions to GoGrid driver @ 2015-06-04 19:51:22 UTC
b3d39cc0e8 Merge pull request #24413 from techhat/gogridnamespace
1b397cb6fe Adding blank line
da08cc9aac Add more namespaced functions to GoGrid driver
ISSUE #24397: (kiorky) on debian: states.apt should use virtualname as it shadows system apt module (refs: #24398, #24400, #24399)
PR #24399: (kiorky) Versionvirtual (refs: #24398) @ 2015-06-04 18:02:22 UTC
PR #24398: (kiorky) VirtualName for states.apt (refs: #24399)
27f109bd76 Merge pull request #24399 from makinacorpus/versionvirtual
235c78ddfe Use apt_pkg.version_compare if available
1c0cd459f8 reindent block to isolate conflict on merge forward
699eceab64 use var to isolate conflict on merge forward
PR #24371: (joejulian) 2015.5 tls module tests @ 2015-06-04 15:20:16 UTC
deaee68b89 Merge pull request #24371 from joejulian/2015.5_tls_module_tests
4c5dee1e25 Add @destructiveTest decorator to destructive tests
274bbd4d43 Accept results from older pyOpenSSL
161f913522 All cert info should be in UTC always
9affcca766 See the whole diff if dict compare fails
94f620857c Ignore extensions for now. Resolve this as part of fixing issue 24338.
84904d31f1 Mask lint warning for unused imported module
5675b78459 Do not test if PyOpenSSL is not installed
563cc66311 Add tls tests
PR #24403: (jayeshka) adding states/process unit test case. @ 2015-06-04 15:19:01 UTC
84686ee695 Merge pull request #24403 from jayeshka/process_states-unit-test
fcb71fb35e adding states/process unit test case.
PR #24402: (jayeshka) adding states/pyenv unit test case. @ 2015-06-04 15:18:11 UTC
35de8d72db Merge pull request #24402 from jayeshka/pyenv_states-unit-test
5f263ab48b adding states/pyenc unit test case.
PR #24401: (jayeshka) adding states/powerpath unit test case. @ 2015-06-04 15:17:46 UTC
632f838838 Merge pull request #24401 from jayeshka/powerpath-states-unit-test
49ff9272ce adding states/powerpath unit test case.
ISSUE #24397: (kiorky) on debian: states.apt should use virtualname as it shadows system apt module (refs: #24398, #24400, #24399)
PR #24400: (kiorky) Aptversion @ 2015-06-04 15:17:19 UTC
0a6e5e0d96 Merge pull request #24400 from makinacorpus/aptversion
e15cb936b5 Use apt_pkg.version_compare if available
953725a563 Fix too much quoting in apt.version_cmp
PR #24385: (jeanpralo) Fix salt.modules.dockerio.start method @ 2015-06-04 15:00:22 UTC
a904055d28 Merge pull request #24385 from jeanpralo/Fix-binds-dockerio.start
a0fed313fa binds dict if not specified should remain to none otherwise docker-py will try to create a new host config and all volume and ports binds are lost. config should be done at the creation of the container not when we start it
PR #24381: (justinta) Disabled flaky test to review later @ 2015-06-04 14:57:43 UTC
9890bc4e43 Merge pull request #24381 from jtand/seed_test
7570ae9132 Disabled flaky test to review later
ISSUE #23342: (philipsd6) salt-ssh 2015.2.0rc2 fails when target doesn't have lspci available (refs: #24382)
PR #24382: (basepi) [2015.5] Handle CommandExecutionError in grains commands, Fixes #23342 @ 2015-06-04 12:44:04 UTC
b3fa8fefcb Merge pull request #24382 from basepi/grainscommandnotfound23342
85b91d64cc Handle CommandExecutionError in grains commands
PR #24379: (Starblade42) Fixes an issue where Pagerduty states/modules couldn't find their profile in the Pillar @ 2015-06-04 12:41:13 UTC
52587a4fc1 Merge pull request #24379 from Starblade42/2015.5
b93dc5ef6c Linting!
2dd5904119 Fixes an issue where Pagerduty states/modules couldn't find its profile in the Pillar
PR #24366: (terminalmage) Use yes $'\n' instead of printf '\n' for pecl commands @ 2015-06-03 21:28:58 UTC
3ca35d1ec3 Merge pull request #24366 from terminalmage/pecl-yes
dcd9ad8b6e Use yes $'n' instead of printf 'n' for pecl commands
ISSUE #24284: (kiorky) systemd lxc containers need use_vt=True at lxc-start stage (refs: #24348)
PR #24348: (kiorky) Try to close input pipes before calling lxc-start @ 2015-06-03 19:38:07 UTC
86a3b317c6 Merge pull request #24348 from makinacorpus/lxcpre
0cb11a2767 lxc: typo
d71efa6d66 Try to close input pipes before calling lxc-start