Salt 2015.5.1 Release Notes¶
- release:
2015-05-20
Version 2015.5.1 is a bugfix release for 2015.5.0.
Statistics¶
Total Merges: 203
Total Issue References: 30
Total PR References: 177
Contributors: 49 (Arabus, Lothiraldan, Snergster, TaiSHiNet, The-Loeki, UtahDave, aboe76, ahus1, basepi, bastiaanb, bradthurber, cachedout, cellscape, corywright, cro, dennisjac, dmyerscough, galet, garethgreenaway, gladiatr72, gtmanfred, iggy, ionutbalutoiu, jacobhammons, jayeshka, jfindlay, joejulian, jpic, justinta, kaidokert, kaithar, kiorky, lisa2lisa, msciciel, nleib, notpeter, optix2000, rahulhan, rallytime, rubic, ryan-lane, s0undt3ch, slinu3d, steverweber, techhat, terminalmage, ticosax, twangboy, whiteinge)
Cloud Runner Changes¶
The fun argument to the cloud.action
runner has changed to func. Please update any calls to this runner.
Changelog for v2015.5.0..v2015.5.1¶
Generated at: 2018-05-27 20:58:00 UTC
PR #23998: (rallytime) Update release note for 2015.5.1 @ 2015-05-20 20:58:55 UTC
2422760ebd Merge pull request #23998 from rallytime/release_notes
113c6049f5 Update release note for 2015.5.1
PR #23989: (rallytime) Backport #23980 to 2015.5 @ 2015-05-20 19:33:41 UTC
PR #23988: (rallytime) Backport #23977 to 2015.5 @ 2015-05-20 19:13:36 UTC
PR #23977: (ionutbalutoiu) Fixed glance image_create (refs: #23988)
d4f1ba02d7 Merge pull request #23988 from rallytime/bp-23977
46fc7c6b69 Fixed glance image_create
PR #23986: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-05-20 18:41:33 UTC
PR #23985: (UtahDave) Add 2014.7.5-2 and 2015.5.0-2 Windows installer download links @ 2015-05-20 18:32:44 UTC
9d1130ef8e Merge pull request #23985 from UtahDave/2015.5local
10338d0c54 Add links to Windows 2015.5.0-2 install downloads
b84f9756c5 updated Windows 2014.7.5-2 installer download link
PR #23983: (rallytime) Versionadded tags for https_user and https_pass args new in 2015.5.0 @ 2015-05-20 18:05:27 UTC
ca7729d023 Merge pull request #23983 from rallytime/versionadded_git_options
14eae22c91 Versionadded tags for https_user and https_pass args new in 2015.5.0
PR #23970: (jayeshka) adding system unit test case @ 2015-05-20 17:12:57 UTC
b06df57e03 Merge pull request #23970 from jayeshka/system-unit-test
89eb00815e adding system unit test case
PR #23967: (jayeshka) adding states/memcached unit test case @ 2015-05-20 17:12:26 UTC
38d5f75756 Merge pull request #23967 from jayeshka/memcached-states-unit-test
8ef9240e25 adding states/memcached unit test case
PR #23966: (jayeshka) adding states/modjk unit test case @ 2015-05-20 17:11:48 UTC
868e807d8a Merge pull request #23966 from jayeshka/modjk-states-unit-test
422a96497d adding states/modjk unit test case
PR #23942: (jacobhammons) Updates to sphinx saltstack2 doc theme @ 2015-05-20 15:43:54 UTC
63164900bd Merge pull request #23942 from jacobhammons/2015.5
31023c8915 Updates to sphinx saltstack2 doc theme
ISSUE #23872: (joejulian) create_ca_signed_cert can error if dereferenced dict is used for args (refs: #23874)
PR #23874: (joejulian) Validate keyword arguments to be valid @ 2015-05-20 04:53:40 UTC
587957badc Merge pull request #23874 from joejulian/2015.5_tls_validate_kwargs
30102acd04 Fix py3 and ordering inconsistency problems.
493f7ad5f0 Validate keyword arguments to be valid
PR #23960: (rallytime) Backport #22114 to 2015.5 @ 2015-05-20 04:37:09 UTC
PR #22114: (dmyerscough) Fixing KeyError when there are no additional pages (refs: #23960)
00c5c22867 Merge pull request #23960 from rallytime/bp-22114
f3e1d63fce Catch KeyError
306b1ea6b8 Fixing KeyError
6b2cda2861 Fix PEP8 complaint
239e50f30d Fixing KeyError when there are no additional pages
PR #23961: (rallytime) Backport #23944 to 2015.5 @ 2015-05-20 04:35:41 UTC
PR #23948: (jfindlay) augeas.change state now returns changes as a dict @ 2015-05-20 04:00:10 UTC
0cb5cd3938 Merge pull request #23948 from jfindlay/augeas_changes
f09b80a8b5 augeas.change state now returns changes as a dict
PR #23957: (rallytime) Backport #23951 to 2015.5 @ 2015-05-20 03:04:24 UTC
ISSUE #23839: (gladiatr72) wonky loader syndrome (refs: #23906)
ISSUE #23373: (tnypex) reactor/orchestrate race condition on salt['pillar.get'] (refs: #23906)
PR #23956: (rallytime) Backport #23906 to 2015.5 @ 2015-05-20 03:04:14 UTC
PR #23906: (gladiatr72) Added exception handler to trap the RuntimeError raised when (refs: #23956)
ebff1ff967 Merge pull request #23956 from rallytime/bp-23906
9d87fd335c add proper marker for format argument
197688ef0c Added exception handler to trap the RuntimeError raised when Depends.enforce_dependency() class method fires unsuccessfully. There appears to be no synchronization within the Depends decorator class wrt the class global dependency_dict which results in incomplete population of any loader instantiation occurring at the time of one of these exceptions.
ISSUE #19852: (TaiSHiNet) DigitalOcean APIv2 can't delete machines when there is only 1 page (refs: #23955)
ISSUE #19304: (TaiSHiNet) DigitalOcean API v2 cannot delete VMs on 2nd page (refs: #19305)
PR #23955: (rallytime) Backport #19305 to 2015.5 @ 2015-05-20 03:03:55 UTC
PR #23940: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-05-19 22:37:58 UTC
02a78fce3d Merge pull request #23940 from basepi/merge-forward-2015.5
36f0065faf Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
913391207a Merge pull request #23939 from basepi/v2014.7.6release
32b65dc2a9 Add extended changelog to 2014.7.6 release notes
0031ca2631 Merge pull request #23881 from garethgreenaway/23820_2014_7_schedule_list_issue
b207f2a433 Missing continue in the list function when deleting unused attributes.
63bd21ecd2 Merge pull request #23887 from basepi/salt-ssh.pillar.get.22131
bc84502f46 Bring salt-ssh pillar.get in line with mainline pillar.get
PR #23932: (rallytime) Backport #23908 to 2015.5 @ 2015-05-19 21:41:28 UTC
PR #23931: (rallytime) Backport #23880 to 2015.5 @ 2015-05-19 21:41:18 UTC
ISSUE #23847: (kiorky) lxc: systemd containers cant be seeded (refs: #23806, #23898, #23897, #23808)
ISSUE #23833: (kiorky) lxc.set_dns fails intermittently (refs: #23807, #23898, #23897, #23808)
ISSUE #23772: (cheuschober) lxc.init fails to bootstrap container (refs: #23806, #23808, #23807, #23898, #23897)
ISSUE #23658: (arthurlogilab) [salt-cloud lxc] too verbose, shows host: True multiple times when starting (refs: #23898, #23897)
ISSUE #23657: (arthurlogilab) [salt-cloud lxc] NameError: global name '__salt__' is not defined (refs: #23898, #23727, #23897)
PR #23898: (kiorky) Lxc profiles (refs: #23897) @ 2015-05-19 21:08:28 UTC
PR #23808: (kiorky) Lxc seed and prof ports (refs: #23807, #23897)
5bdbf0af9b Merge pull request #23898 from makinacorpus/lxc_profiles
d9051a047a lxc: systemd support
e8d674fed4 lxc: chroot fallback toggle
e2887a0d44 lxc: sync func name with develop
e96e345799 lxc more fixes (lxc.set_dns)
fdb64245d4 lxc: Fix salt config (no more a kwarg)
63e63fa527 repair salt cloud lxc api on develop
80eabe2703 lxc salt cloud doc
73f229d966 lxc: unificate saltconfig/master/master_port
0bc1f08a6b lxc: refactor a bit saltcloud/lxc interface
7a80370da9 lxc: get networkprofile from saltcloud
47acb2e159 lxc: default net profile has now correct options
7eadf4863c lxc: select the appropriate default bridge
ISSUE #23900: (hashi825) salt ubuntu network building issue 2015.5.0 (refs: #23922)
PR #23922: (garethgreenaway) Fixes to debian_ip.py @ 2015-05-19 18:50:53 UTC
b818f72dce Merge pull request #23922 from garethgreenaway/23900_2015_5_bonding_interface_fixes
0bba536d6d Fixing issue reported when using bonded interfaces on Ubuntu. Attributes should be bond-, but the code was attempting to split just on bond_. Fix accounts for both, but the debian_ip.py module will write out bond attributes with bond-
PR #23925: (jpic) Fixed wrong path in LXC cloud documentation @ 2015-05-19 18:23:56 UTC
PR #23894: (whiteinge) Add __all__ attribute to Mock class for docs @ 2015-05-19 17:17:35 UTC
7f6a716a8a Merge pull request #23894 from whiteinge/doc-mock__all__
6eeca46158 Add __all__ attribute to Mock class for docs
ISSUE #23767: (chrimi) Salt system.locale fails on non existent default locale (refs: #23884)
PR #23884: (jfindlay) Fix locale.set_locale on debian @ 2015-05-19 15:51:22 UTC
8108a9bd19 Merge pull request #23884 from jfindlay/fix_locale
91c2d51400 use append_if_not_found in locale.set_locale
e63260391c (re)generate /etc/default/locale
PR #23866: (jfindlay) backport #23834, change portage.dep.strip_empty to list comprehension @ 2015-05-19 15:50:43 UTC
PR #23834: (Arabus) Avoid deprecation warning from portage.dep.strip_empty() (refs: #23866)
6bae12fa8b Merge pull request #23866 from jfindlay/flag_strip
aa032ccfaf replace portage.dep.strip_empty() with list comprehension
7576872280 Proper replacement for portage.dep.strip_empty() with list comprehension, pep8fix
2851a5cf13 Switch portage.dep.strip_empty(...) to filter(None,...) to avoid deprecation warning and do essentially the same
ISSUE #23904: (mbrgm) Network config bonding section cannot be parsed when attribute names use dashes (refs: #23917)
PR #23917: (corywright) Split debian bonding options on dash instead of underscore @ 2015-05-19 15:44:35 UTC
a67a008913 Merge pull request #23917 from corywright/issue23904
c06f8cf831 Split debian bonding options on dash instead of underscore
PR #23909: (jayeshka) 'str' object has no attribute 'capitalized' @ 2015-05-19 15:41:53 UTC
e8fcd0994d Merge pull request #23909 from jayeshka/file-exe-module
e422d9d200 'str' object has no attribute 'capitalized'
PR #23903: (garethgreenaway) Adding docs for missing schedule state module parameters. @ 2015-05-19 06:29:34 UTC
c73bf38927 Merge pull request #23903 from garethgreenaway/missing_docs_schedule_state
acd8ab9e1d Adding docs for missing schedule state module parameters.
a56697bd6e Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5
1c2af5c685 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5
ef581283fa Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5
8664e8bc8d Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5-2
46eb2655ee saltstack2 sphinx theme updates
e7442d3b1e Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5
ee3c1bd4a7 missed one
3872921dd0 More updates to sphinx2 theme
fcd48657ef Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5
8c32152be0 removed TOC numbering, additional tweaks to layout.html
73dfaeff28 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5
16d8a753ad saltstack2 sphinx theme and build settings
ISSUE #23847: (kiorky) lxc: systemd containers cant be seeded (refs: #23806, #23898, #23897, #23808)
ISSUE #23772: (cheuschober) lxc.init fails to bootstrap container (refs: #23806, #23808, #23807, #23898, #23897)
PR #23806: (kiorky) Lxc seeding (refs: #23807) @ 2015-05-18 23:18:33 UTC
ff3cc7d331 Merge pull request #23806 from makinacorpus/lxc_seeding
61b7aad308 runners/lxc: optim
PR #23892: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-05-18 23:07:57 UTC
5f1a93d966 Merge pull request #23892 from basepi/merge-forward-2015.5
c2eed77691 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
17c5810c04 Merge pull request #23891 from basepi/releasenotes
dec153bcea Update the release notes index page
a93e58f80f Merge pull request #23888 from basepi/v2014.7.6release
49921b6cb2 Update the 2014.7.6 release notes with CVE details
50730287bb Merge pull request #23871 from rallytime/bp-23848
379c09c3a5 Updated for SLES 12.
PR #23875: (rallytime) Backport #23838 to 2015.5 @ 2015-05-18 22:28:55 UTC
PR #23876: (rallytime) Switch digital ocean tests to v2 driver @ 2015-05-18 22:17:13 UTC
d294cf260b Merge pull request #23876 from rallytime/switch_digital_ocean_tests_v2
dce9b540a6 Remove extra line
4acf58e758 Switch digital ocean tests to v2 driver
ISSUE #23792: (neogenix) Salt Scheduler Incorrect Response (True, should be False) (refs: #23882)
PR #23882: (garethgreenaway) Fixes to scheduler in 2015.5 @ 2015-05-18 22:09:24 UTC
b97a48c7f5 Merge pull request #23882 from garethgreenaway/23792_2015_5_wrong_return_code
37dbde6d57 Job already exists in schedule, should return False.
PR #23868: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-05-18 18:35:54 UTC
61c922ea1a Merge pull request #23868 from basepi/merge-forward-2015.5
c9ed23394c Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
aee00c83df Merge pull request #23810 from rallytime/bp-23757
fb32c32065 use abspath, do not eliminating symlinks
6b3352bb1a Merge pull request #23809 from rallytime/virt_get_nics_fix
0616fb7884 Fix virtualport section of virt.get_nics loop
188f03f567 Merge pull request #23823 from gtmanfred/2014.7
5ef006d59d add link local for ipv6
f3ca682f92 Merge pull request #23802 from gtmanfred/2014.7
2da98b58c8 if it is ipv6 ip_to_int will fail
PR #23863: (rahulhan) Adding states/timezone.py unit test @ 2015-05-18 17:02:19 UTC
433f87372c Merge pull request #23863 from rahulhan/states_timezone_unit_test
72fcabc690 Adding states/timezone.py unit test
PR #23862: (rahulhan) Adding states/tomcat.py unit tests @ 2015-05-18 17:02:10 UTC
37b3ee5421 Merge pull request #23862 from rahulhan/states_tomcat_unit_test
65d7752d2a Adding states/tomcat.py unit tests
PR #23860: (rahulhan) Adding states/test.py unit tests @ 2015-05-18 17:01:49 UTC
dde7207acb Merge pull request #23860 from rahulhan/states_test_unit_test
1f4cf86500 Adding states/test.py unit tests
PR #23859: (rahulhan) Adding states/sysrc.py unit tests @ 2015-05-18 17:01:46 UTC
3c9b8139e8 Merge pull request #23859 from rahulhan/states_sysrc_unit_test
6a903b054d Adding states/sysrc.py unit tests
PR #23812: (rallytime) Backport #23790 to 2015.5 @ 2015-05-18 15:30:34 UTC
PR #23811: (rallytime) Backport #23786 to 2015.5 @ 2015-05-18 15:30:27 UTC
PR #23850: (jayeshka) adding sysbench unit test case @ 2015-05-18 15:28:04 UTC
ce60582de4 Merge pull request #23850 from jayeshka/sysbench-unit-test
280abdec7c adding sysbench unit test case
PR #23843: (The-Loeki) Fix erroneous virtual:physical core grain detection @ 2015-05-18 15:24:22 UTC
060902fefa Merge pull request #23843 from The-Loeki/patch-1
9e2cf606eb Fix erroneous virtual:physical core grain detection
ISSUE #23815: (Snergster) [beacons] inotify errors on subdir creation (refs: #23816)
ISSUE #23685: (Snergster) inotify beacon on file. 'change' event to reactor to reset file to known state will cause loop (refs: #23816)
PR #23816: (Snergster) Doc for #23685 Added prereq, caution, and additional mask information @ 2015-05-18 15:18:03 UTC
3257a9bead Merge pull request #23816 from Snergster/23685-doc-fix
0fca49d52a Added prereq, caution, and additional mask information
PR #23832: (ahus1) make saltify provider use standard boostrap procedure @ 2015-05-18 02:18:29 UTC
PR #23829: (ahus1) make saltify provider use standard boostrap procedure (refs: #23832)
3df3b85090 Merge pull request #23832 from ahus1/ahus1_saltify_bootstrap_2015.5
f5b1734782 fixing problem in unit test
cba47f6856 make saltify to use standard boostrap procedure, therefore providing all options like master_sign_pub_file
PR #23791: (optix2000) Psutil compat @ 2015-05-16 04:05:54 UTC
8ec4fb2a73 Merge pull request #23791 from optix2000/psutil_compat
5470cf58db Fix pylint errors and sloppy inline comments
64634b6349 Update psutil.pid_list to use psutil.pids
5dd6d69192 Fix imports that aren't in __all__
8a1da33ada Fix test cases by mocking psutil_compat
558798df1f Fix net_io_counters deprecation issue
8140f92ba8 Override unnecessary pylint errors
7d02ad4f06 Fix some of the mock names for the new API
9b3023e851 Fix overloaded getters/setters. Fix line lengths
180eb87a46 Fix whitespace
f8edf72f98 Use new psutil API in ps module
e48982ff9c Fix version checking in psutil_compat
93ee411fd5 Create compatibility psutil. psutil 3.0 drops 1.0 API, but we still support old psutil versions.
PR #23782: (terminalmage) Replace "command -v" with "which" and get rid of spurious log messages @ 2015-05-16 04:03:10 UTC
405517be8b Merge pull request #23782 from terminalmage/issue23772
0f6f239052 More ignore_retcode to suppress spurious log msgs
b4c48e62ea Ignore return code in lxc.attachable
08658c0177 Replace "command -v" with "which"
PR #23783: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-05-15 21:38:51 UTC
cb2eb401f3 Merge pull request #23783 from basepi/merge-forward-2015.5
9df51caf28 __opts__.get
51d23ed9d0 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
d9af0c3e82 Merge pull request #23488 from cellscape/lxc-cloud-fixes
64250a67e5 Remove profile from opts after creating LXC container
c4047d2a71 Set destroy=True in opts when destroying cloud instance
9e1311a7cd Store instance names in opts when performing cloud action
934bc57c73 Correctly pass custom env to lxc-attach
7fb85f7be1 Preserve test=True option in cloud states
9771b5a313 Fix detection of absent LXC container in cloud state
fb24f0cf02 Report failure when failed to create/clone LXC container
2d9aa2bb97 Avoid shadowing variables in lxc module
792e1021f2 Allow overriding profile options in lxc.cloud_init_interface
42bd64b9b3 Return changes on successful lxc.create from salt-cloud
4409eabb83 Return correct result when creating cloud LXC container
377015c881 Issue #16424: List all providers when creating salt-cloud instance without profile
808bbe1cb2 Merge pull request #23748 from basepi/salt-ssh.roster.host.check
bc53e049e0 Log entire exception for render errors in roster
753de6a621 Log render errors in roster to error level
e01a7a90b3 Always let the real YAML error through
72cf360255 Merge pull request #23731 from twangboy/fix_22959
88e5495b2d Fixes #22959: Trying to add a directory to an unmapped drive in windows
2610195262 Merge pull request #23730 from rallytime/bp-23729
1877caecba adding support for nested grains to grains.item
3e9df883d6 Merge pull request #23688 from twangboy/fix_23415
6a91169bae Fixed unused-import pylint error
5e25b3f355 fixed pylint errors
1a9676626f Added inet_pton to utils/validate/net.py for ip.set_static_ip in windows
PR #23781: (jfindlay) fix unit test mock errors on arch @ 2015-05-15 19:40:07 UTC
982f87316d Merge pull request #23781 from jfindlay/fix_locale_tests
14c711eeb3 fix unit test mock errors on arch
ISSUE #23566: (rks2286) Salt-cp corrupting the file after transfer to minion (refs: #23740)
PR #23740: (jfindlay) Binary write @ 2015-05-15 18:10:44 UTC
916b1c4f7c Merge pull request #23740 from jfindlay/binary_write
626930a4e5 update incorrect comment wording
a978f5c091 always use binary file write mode on windows
ISSUE #23682: (chrish42) Pip module requires system pip, even when not used (with env_bin) (refs: #23736)
PR #23736: (jfindlay) always load pip execution module @ 2015-05-15 18:10:16 UTC
348645ecd5 Merge pull request #23736 from jfindlay/fix_pip
b8867a8c23 update pip tests
040bbc42d2 only check pip version in one place
6c453a5a2a check for executable status of bin_env
3337257833 always load the pip module as pip could be anywhere
PR #23770: (cellscape) Fix cloud LXC container destruction @ 2015-05-15 17:38:59 UTC
10cedfb174 Merge pull request #23770 from cellscape/fix-cloud-lxc-destruction
4f6021c884 Fix cloud LXC container destruction
PR #23759: (lisa2lisa) fixed the problem for not beable to revoke ., for more detail https… @ 2015-05-15 17:38:38 UTC
ddea822b02 Merge pull request #23759 from lisa2lisa/iss23664
a29f161a58 fixed the problem for not beable to revoke ., for more detail https://github.com/saltstack/salt/issues/23201, fixed mysql cannot create user with pure digit password, for more info https://github.com/saltstack/salt/issues/23664
PR #23769: (cellscape) Fix file_roots CA lookup in salt.utils.http.get_ca_bundle @ 2015-05-15 16:21:49 UTC
10615ff5a7 Merge pull request #23769 from cellscape/utils-http-ca-file-roots
8e90f3291b Fix file_roots CA lookup in salt.utils.http.get_ca_bundle
PR #23765: (jayeshka) adding states/makeconf unit test case @ 2015-05-15 14:29:43 UTC
fd8a1b797f Merge pull request #23765 from jayeshka/makeconf_states-unit-test
26e31afa31 adding states/makeconf unit test case
PR #23760: (ticosax) [doc] document refresh argument @ 2015-05-15 14:23:47 UTC
ee13b08027 Merge pull request #23760 from ticosax/2015.5
e3ca859ba6 document refresh argument
PR #23766: (jayeshka) adding svn unit test case @ 2015-05-15 14:23:18 UTC
a017f725a4 Merge pull request #23766 from jayeshka/svn-unit-test
19939cfa98 adding svn unit test case
ISSUE #23734: (bradthurber) 2015.5.0 modules/archive.py ZipFile instance has no attribute '__exit__' - only python 2.6? (refs: #23737)
PR #23751: (rallytime) Backport #23737 to 2015.5 @ 2015-05-15 03:58:37 UTC
PR #23737: (bradthurber) fix for 2015.5.0 modules/archive.py ZipFile instance has no attribute… (refs: #23751)
0ed9d45114 Merge pull request #23751 from rallytime/bp-23737
8d1eb326d0 fix for 2015.5.0 modules/archive.py ZipFile instance has no attribute '__exit__' - only python 2.6? #23734
ISSUE #23709: (kiorky) cmdmod: enhancement is really needed for stateful commands (refs: #23710)
PR #23710: (kiorky) Get more useful output from stateful commands @ 2015-05-14 21:58:10 UTC
d73984ec9c Merge pull request #23710 from makinacorpus/i23709
c70690969e Get more useful output from stateful commands
ISSUE #23608: (kaidokert) salt-cloud file_map with non-root user (refs: #23609)
PR #23724: (rallytime) Backport #23609 to 2015.5 @ 2015-05-14 19:34:22 UTC
PR #23723: (rallytime) Backport #23568 to 2015.5 @ 2015-05-14 19:34:11 UTC
PR #23725: (rallytime) Backport #23691 to 2015.5 @ 2015-05-14 19:32:30 UTC
PR #23722: (rallytime) Backport #23472 to 2015.5 @ 2015-05-14 19:31:52 UTC
ISSUE #23657: (arthurlogilab) [salt-cloud lxc] NameError: global name '__salt__' is not defined (refs: #23898, #23727, #23897)
PR #23727: (jfindlay) fix npm execution module stacktrace @ 2015-05-14 18:14:12 UTC
cbf4ca8d91 Merge pull request #23727 from jfindlay/npm_salt
05392f282e fix npm execution module stacktrace
PR #23718: (rahulhan) Adding states/user.py unit tests @ 2015-05-14 17:15:38 UTC
ef536d58de Merge pull request #23718 from rahulhan/states_user_unit_tests
aad27db513 Adding states/user.py unit tests
PR #23720: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-05-14 17:13:02 UTC
a529d74079 Merge pull request #23720 from basepi/merge-forward-2015.5
06a3ebd9d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
1b86460d73 Merge pull request #23680 from cachedout/issue_23403
d5986c21b4 Rename kwarg in cloud runner
cd64af0ce4 Merge pull request #23674 from cachedout/issue_23548
da8a2f5cb3 Handle lists correctly in grains.list_prsesent
d322a19213 Merge pull request #23672 from twangboy/fix_user_present
731e7af3dd Merge branch '2014.7' of https://github.com/saltstack/salt into fix_user_present
d6f70a4545 Fixed user.present to create password in windows
43f7025000 Merge pull request #23670 from rallytime/bp-23607
ed30dc4642 Fix for #23604. No error reporting. Exitcode !=0 are ok
PR #23704: (jayeshka) adding states/lvs_server unit test case @ 2015-05-14 14:22:10 UTC
13facbf077 Merge pull request #23704 from jayeshka/lvs_server_states-unit-test
da323dab0b adding states/lvs_server unit test case
PR #23703: (jayeshka) adding states/lvs_service unit test case @ 2015-05-14 14:21:23 UTC
f95ca3188f Merge pull request #23703 from jayeshka/lvs_service_states-unit-test
66717c8133 adding states/lvs_service unit test case
PR #23702: (jayeshka) Remove superfluous return statement. @ 2015-05-14 14:20:42 UTC
07e987e327 Merge pull request #23702 from jayeshka/fix_lvs_service
ecff2181e4 fix lvs_service
PR #23686: (jfindlay) remove superfluous return statement @ 2015-05-14 14:20:18 UTC
39973d4095 Merge pull request #23686 from jfindlay/fix_lvs_server
5aaeb73532 remove superfluous return statement
PR #23690: (rallytime) Backport #23424 to 2015.5 @ 2015-05-13 23:04:36 UTC
PR #23681: (cachedout) Start on 2015.5.1 release notes @ 2015-05-13 19:44:22 UTC
1a0db43097 Merge pull request #23681 from cachedout/2015_5_1_release_notes
bdbbfa6ee7 Start on 2015.5.1 release notes
PR #23679: (jfindlay) Merge #23616 @ 2015-05-13 19:03:53 UTC
PR #23675: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-05-13 18:35:54 UTC
e480f13688 Merge pull request #23675 from basepi/merge-forward-2015.5
bd635488ef Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
0f006ac1d8 Merge pull request #23661 from rallytime/merge-23640
4427f42bb6 Whitespace fix
dd9115466e Add warning to get_or_set_hash about reserved chars
84e2ef88fc Merge pull request #23639 from cachedout/issue_23452
d418b49a77 Syntax error!
45b4015d7d Handle exceptions raised by __virtual__
bd9b94ba8c Merge pull request #23637 from cachedout/issue_23611
56cb1f52e3 Fix typo
f6fcf19a7f Convert str master to list
f20c0e42ce Merge pull request #23595 from rallytime/bp-23549
6efcac09ad Update __init__.py
1acaf86da7 Merge pull request #23594 from rallytime/bp-23496
d5ae1d268a Fix for issue #23110 This resolves issues when the freshly created directory is removed by fileserver.update.
2c221c7332 Merge pull request #23593 from rallytime/bp-23442
39869a15bd check w/ low['name'] only
304cc499e9 another fix for file defined w/ id, but require name
8814d4180e add directory itself to keep list
fadd1ef63c Merge pull request #23606 from twangboy/fix_installer
038331edab Fixed checkbox for starting service and actually starting it
acdd3fc6bd Fix lint
680e88f058 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
10b3f0f643 Merge pull request #23592 from rallytime/bp-23389
734cc43801 Correct fail_hard typo
cd34b9b6c4 Merge pull request #23573 from techhat/novaquery
f92db5e92f Linting
26e00d3ccc Scan all available networks for public and private IPs
2a72cd71c2 Merge pull request #23558 from jfindlay/fix_ebuild
45404fb2a6 reorder emerge command line
a664a3c6fd Merge pull request #23530 from dr4Ke/fix_salt-ssh_to_include_pkg_sources
5df6a8008c fix pylint warning
d0549e56ba salt-ssh state: fix including all salt:// references
55c3869861 Merge pull request #23433 from twangboy/list_pkgs_fix
8ab5b1b86f Fix pylint error
2d11d6545e Obtain all software from the registry
755bed0abd Merge pull request #23554 from jleroy/debian-hostname-fix
5ff749e487 Debian: Hostname always updated
6ec87ce9f5 Merge pull request #23551 from dr4Ke/grains.append_unit_tests
ebff9df5b2 fix pylint errors
c4954046ad unit tests for grains.append module function
0c9a32326c use MagickMock
c838a22377 unit tests for grains.append module function
e96c5c5bf3 Merge pull request #23474 from dr4Ke/fix_grains.append_nested
a01a5bb51e grains.get, parameter delimiter, versionadded: 2014.7.6
b39f50475d remove debugging output
b6e15e295c fix grains.append in nested dictionary grains #23411
ab7e1aed8e Merge pull request #23537 from t0rrant/patch-1
8e03cc99d3 Update changelog
PR #23669: (rallytime) Backport #23586 to 2015.5 @ 2015-05-13 18:27:11 UTC
PR #23586: (Lothiraldan) Fix salt.state.file._unify_sources_and_hashes when sources is used without sources_hashes (refs: #23669)
0dad6be0fc Merge pull request #23669 from rallytime/bp-23586
ef4c6adae3 Remove another unused import
73cfda751a Remove unused import
52b68d695a Use the zip_longest from six module for python 3 compatibility
18d5ff9a8e Fix salt.state.file._unify_sources_and_hashes when sources is used without sources_hashes
PR #23662: (rallytime) Merge #23642 with pylint fix @ 2015-05-13 15:46:51 UTC
PR #23622: (jfindlay) merge #23508 @ 2015-05-13 15:36:49 UTC
PR #23508: (cro) Port mysql returner to postgres using jsonb datatype (refs: #23622)
072b92733d Merge pull request #23622 from jfindlay/pgjsonb
454322c7e4 appease pylint's proscription on blank line excess
57c617136d Get time with timezone correct also in job return.
e109d0f643 Get time with timezone correct.
21e06b9112 Fix SQL, remove unneeded imports.
653f360723 Stop making changes in 2 places.
d6daaa0292 Typo.
7d748bff75 SSL is handled differently by Pg, so don't set it here.
cc7c377bcd Fill alter_time field in salt_events with current time with timezone.
43defe9b20 Port mysql module to Postgres using jsonb datatypes
PR #23651: (jayeshka) adding solr unit test case @ 2015-05-13 15:26:15 UTC
c1bdd4d377 Merge pull request #23651 from jayeshka/solr-unit-test
6e05148962 adding solr unit test case
PR #23649: (jayeshka) adding states/libvirt unit test case @ 2015-05-13 15:24:48 UTC
ee43411677 Merge pull request #23649 from jayeshka/libvirt_states-unit-test
0fb923a283 adding states/libvirt unit test case
PR #23648: (jayeshka) adding states/linux_acl unit test case @ 2015-05-13 15:24:11 UTC
c7fc466f1e Merge pull request #23648 from jayeshka/linux_acl_states-unit-test
3f0ab29eb0 removed error.
11081c121c adding states/linux_acl unit test case
PR #23650: (jayeshka) adding states/kmod unit test case @ 2015-05-13 15:09:18 UTC
4cba7ba35c Merge pull request #23650 from jayeshka/kmod_states-unit-test
1987015033 adding states/kmod unit test case
PR #23633: (jayeshka) made changes to test_interfaces function. @ 2015-05-13 06:51:07 UTC
bc8faf1543 Merge pull request #23633 from jayeshka/win_network-2015.5-unit-test
0936e1d386 made changes to test_interfaces function.
PR #23619: (jfindlay) fix kmod.present processing of module loading @ 2015-05-13 01:16:56 UTC
7df3579bbc Merge pull request #23619 from jfindlay/fix_kmod_state
73facbfc1f fix kmod.present processing of module loading
PR #23598: (rahulhan) Adding states/win_dns_client.py unit tests @ 2015-05-12 21:47:36 UTC
d4f30955fa Merge pull request #23598 from rahulhan/states_win_dns_client_unit_test
d08d885828 Adding states/win_dns_client.py unit tests
PR #23597: (rahulhan) Adding states/vbox_guest.py unit tests @ 2015-05-12 21:46:30 UTC
811c6a1d89 Merge pull request #23597 from rahulhan/states_vbox_guest_unit_test
6a2909eeea Removed errors
4cde78a58a Adding states/vbox_guest.py unit tests
PR #23615: (rallytime) Backport #23577 to 2015.5 @ 2015-05-12 21:19:11 UTC
PR #23603: (rahulhan) Adding states/winrepo.py unit tests @ 2015-05-12 18:40:12 UTC
b8589532d1 Merge pull request #23603 from rahulhan/states_winrepo_unit_test
a66e7e7f1f Adding states/winrepo.py unit tests
PR #23602: (rahulhan) Adding states/win_path.py unit tests @ 2015-05-12 18:39:37 UTC
3cbbd6d277 Merge pull request #23602 from rahulhan/states_win_path_unit_test
122c29f71a Adding states/win_path.py unit tests
PR #23600: (rahulhan) Adding states/win_network.py unit tests @ 2015-05-12 18:39:01 UTC
3c904e8739 Merge pull request #23600 from rahulhan/states_win_network_unit_test
b418404eb7 removed lint error
1be802300b Adding states/win_network.py unit tests
PR #23599: (rahulhan) Adding win_firewall.py unit tests @ 2015-05-12 18:37:49 UTC
10243a7742 Merge pull request #23599 from rahulhan/states_win_firewall_unit_test
6cda890517 Adding win_firewall.py unit tests
PR #23601: (basepi) Add versionadded for jboss module/state @ 2015-05-12 17:22:59 UTC
e73071dbdf Merge pull request #23601 from basepi/jboss.version.added
0174c8fe58 Add versionadded for jboss module/state
PR #23469: (s0undt3ch) Call the windows specific function not the general one @ 2015-05-12 16:47:22 UTC
9beb7bc529 Merge pull request #23469 from s0undt3ch/hotfix/call-the-win-func
83e88a3eb1 Call the windows specific function not the general one
PR #23583: (jayeshka) adding states/ipset unit test case @ 2015-05-12 16:31:55 UTC
d2f097584c Merge pull request #23583 from jayeshka/ipset_states-unit-test
4330cf4a6e adding states/ipset unit test case
PR #23582: (jayeshka) adding states/keyboard unit test case @ 2015-05-12 16:31:17 UTC
82a47e8cbf Merge pull request #23582 from jayeshka/keyboard_states-unit-test
fa94d7ab5c adding states/keyboard unit test case
PR #23581: (jayeshka) adding states/layman unit test case @ 2015-05-12 16:30:36 UTC
77e5b28566 Merge pull request #23581 from jayeshka/layman_states-unit-test
297b055b1c adding states/layman unit test case
PR #23580: (jayeshka) adding smf unit test case @ 2015-05-12 16:29:58 UTC
cbe32828ef Merge pull request #23580 from jayeshka/smf-unit-test
4f9719157b adding smf unit test case
ISSUE #21603: (ipmb) ssh_auth.present fails on key without comment (refs: #23572)
PR #23572: (The-Loeki) Fix regression of #21355 introduced by #21603 @ 2015-05-12 16:28:05 UTC
ISSUE #23490: (lichtamberg) salt.modules.aptpkg.upgrade should have default "dist_upgrade=False" (refs: #23565)
PR #23565: (garethgreenaway) fix to aptpkg module @ 2015-05-12 16:25:46 UTC
f843f89cd7 Merge pull request #23565 from garethgreenaway/2015_2_aptpkg_upgrade_default_to_upgrade
97ae514641 aptpkg.upgrade should default to upgrade instead of dist_upgrade.
ISSUE #23473: (terminalmage) unit.modules.rh_ip_test.RhipTestCase.test_build_bond is not properly mocked (refs: #23550)
PR #23550: (jfindlay) additional mock for rh_ip_test test_build_bond @ 2015-05-12 15:17:16 UTC
c1157cdaee Merge pull request #23550 from jfindlay/fix_rh_ip_test
e9b94d36d3 additional mock for rh_ip_test test_build_bond
PR #23552: (garethgreenaway) Fix for an issue caused by a previous pull request @ 2015-05-11 21:54:59 UTC
b593328176 Merge pull request #23552 from garethgreenaway/2015_5_returner_fix_broken_previous_pr
7d70e2b334 Passed argumentes in the call _fetch_profile_opts to were in the wrong order
PR #23547: (slinu3d) Added AWS v4 signature support for 2015.5 @ 2015-05-11 21:52:24 UTC
d0f96825dd Merge pull request #23547 from slinu3d/2015.5
f3bfdb561b Fixed urlparse and urlencode calls
802dbdb965 Added AWS v4 signature support for 2015.5
PR #23544: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-05-11 18:02:06 UTC
06c6a1f44a Merge pull request #23544 from basepi/merge-forward-2015.5
f8a36bc155 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
b79fed3a92 Merge pull request #23538 from cro/licupdate
345efe25c9 Update date in LICENSE file
a123a36f05 Merge pull request #23505 from aneeshusa/remove-unused-ssh-config-validator
90af1672ca Remove unused ssh config validator. Fixes #23159.
ca2c21a63c Merge pull request #23467 from slinu3d/2014.7
0b4081d8f4 Fixed pylint error at line 363
5be5eb5b14 Fixed pylink errors
e64f374ffa Fixed lint errors
b9d1ac4f1f Added AWS v4 signature support
e6f9eec02e Merge pull request #23444 from techhat/novacreateattach
ebdb7eae2d Add create_attach_volume to nova driver
e331463319 Merge pull request #23460 from s0undt3ch/hotfix/bootstrap-script-2014.7
edcd0c41f2 Update to latest stable bootstrap script v2015.05.07
7a8ce1a954 Merge pull request #23439 from techhat/maxtries
0ad3ff2c88 Add wait_for_passwd_maxtries variable
ISSUE #23426: (twangboy) Can't restart salt-minion on 64 bit windows (2015.5.0) (refs: #23470)
PR #23470: (twangboy) Fixed service.restart for salt-minion @ 2015-05-11 17:54:47 UTC
aa5b896d3e Merge pull request #23470 from twangboy/fix_svc_restart
b3f284c517 Fixed tests
ad44d79f26 Fixed service.restart for salt-minion
PR #23539: (rahulhan) Adding states/virtualenv_mod.py unit tests @ 2015-05-11 17:02:31 UTC
67988b21ee Merge pull request #23539 from rahulhan/states_virtualenv_mod_unit_test
750bb07d1c Adding states/virtualenv_mod.py unit tests
c96619653e Merge pull request #23423 from cachedout/remove_jid_event_from_orch
f81aab7627 Remove jid_event from state.orch
2bb09b7ee7 Merge pull request #23509 from keesbos/Catch_empty_environment
6dedeaccd2 Catch the unset (empty/None) environment case
6d42f30271 Merge pull request #23245 from freimer/issue_23244
24cf6ebad5 Add Caller functionality to reactors.
PR #23513: (gladiatr72) short-circuit auto-failure of iptables.delete state @ 2015-05-11 15:18:33 UTC
c3f03d827d Merge pull request #23513 from gladiatr72/RFC_stop_iptables.check_from_short-circuiting_position-only_delete_rule
c71714c364 short-circuit auto-failure of iptables.delete state if position argument is set without the other accoutrements that check_rule requires.
PR #23534: (jayeshka) adding states/ini_manage unit test case @ 2015-05-11 14:32:06 UTC
4e77f6f8c4 Merge pull request #23534 from jayeshka/ini_manage_states-unit-test
831223c31c adding states/ini_manage unit test case
PR #23533: (jayeshka) adding states/hipchat unit test case @ 2015-05-11 14:30:22 UTC
11ba9ed99b Merge pull request #23533 from jayeshka/hipchat-states-unit-test
41d14b322d adding states/hipchat unit test case
PR #23532: (jayeshka) adding states/ipmi unit test case @ 2015-05-11 14:28:15 UTC
e5421139d3 Merge pull request #23532 from jayeshka/ipmi-states-unit-test
fc3e64a8a4 adding states/ipmi unit test case
PR #23531: (jayeshka) adding service unit test case @ 2015-05-11 14:27:12 UTC
9ba85fd31a Merge pull request #23531 from jayeshka/service-unit-test
3ad5314ee0 adding service unit test case
ISSUE #23512: (mostafahussein) hipchat_returner / slack_returner not work correctly (refs: #23517)
PR #23517: (garethgreenaway) fix to returners @ 2015-05-11 14:20:51 UTC
PR #23502: (rahulhan) Adding states/win_servermanager.py unit tests @ 2015-05-08 19:47:18 UTC
6be7d8d13b Merge pull request #23502 from rahulhan/states_win_servermanager_unit_test
2490074aa2 Adding states/win_servermanager.py unit tests
PR #23495: (jayeshka) adding seed unit test case @ 2015-05-08 17:30:38 UTC
604857811e Merge pull request #23495 from jayeshka/seed-unit-test
3f134bc573 adding seed unit test case
PR #23494: (jayeshka) adding sensors unit test case @ 2015-05-08 17:30:18 UTC
70bc3c1415 Merge pull request #23494 from jayeshka/sensors-unit-test
1fb48a31a8 adding sensors unit test case
PR #23493: (jayeshka) adding states/incron unit test case @ 2015-05-08 17:29:59 UTC
b981b20d44 Merge pull request #23493 from jayeshka/incron-states-unit-test
cc7bc170f3 adding states/incron unit test case
PR #23492: (jayeshka) adding states/influxdb_database unit test case @ 2015-05-08 17:29:51 UTC
4019c493a1 Merge pull request #23492 from jayeshka/influxdb_database-states-unit-test
e1fcac815d adding states/influxdb_database unit test case
PR #23491: (jayeshka) adding states/influxdb_user unit test case @ 2015-05-08 16:24:07 UTC
d317a77afb Merge pull request #23491 from jayeshka/influxdb_user-states-unit-test
9d4043f9ff adding states/influxdb_user unit test case
PR #23477: (galet) LDAP auth: Escape filter value for group membership search @ 2015-05-07 22:04:48 UTC
e0b2a73eb4 Merge pull request #23477 from galet/ldap-filter-escaping
33038b9f86 LDAP auth: Escape filter value for group membership search
PR #23476: (cachedout) Lint becaon @ 2015-05-07 19:55:36 UTC
PR #23431: (UtahDave) Beacon fixes (refs: #23476) @ 2015-05-07 19:53:47 UTC
1e299ede4f Merge pull request #23431 from UtahDave/beacon_fixes
152f2235c2 remove unused import
81198f9399 fix interval logic and example
5504778adf update to proper examples
6890439d58 fix list for mask
ee7b579e90 remove custom interval code.
PR #23468: (rahulhan) Adding states/win_system.py unit tests @ 2015-05-07 19:20:50 UTC
ea55c44bbb Merge pull request #23468 from rahulhan/states_win_system_unit_test
33f8c12e9f Adding states/win_system.py unit tests
PR #23466: (UtahDave) minor spelling fix @ 2015-05-07 19:19:06 UTC
e6e11147af Merge pull request #23466 from UtahDave/2015.5local
b2c399a137 minor spelling fix
PR #23461: (s0undt3ch) [2015.5] Update to latest stable bootstrap script v2015.05.07 @ 2015-05-07 19:16:18 UTC
4eeb1e627a Merge pull request #23461 from s0undt3ch/hotfix/bootstrap-script
638c63d635 Update to latest stable bootstrap script v2015.05.07
PR #23450: (jayeshka) adding scsi unit test case @ 2015-05-07 19:00:28 UTC
865127844a Merge pull request #23450 from jayeshka/scsi-unit-test
e7269ff29b adding scsi unit test case
PR #23449: (jayeshka) adding s3 unit test case @ 2015-05-07 18:59:45 UTC
8b374ae64d Merge pull request #23449 from jayeshka/s3-unit-test
85786bfe7f adding s3 unit test case
PR #23448: (jayeshka) adding states/keystone unit test case @ 2015-05-07 18:58:59 UTC
49b431c8e4 Merge pull request #23448 from jayeshka/keystone-states-unit-test
a3050eb3e2 adding states/keystone unit test case
PR #23447: (jayeshka) adding states/grafana unit test case @ 2015-05-07 18:58:20 UTC
23d7e7ef92 Merge pull request #23447 from jayeshka/grafana-states-unit-test
7e90a4aaca adding states/grafana unit test case
PR #23438: (techhat) Gate requests import @ 2015-05-07 07:22:58 UTC
1fd0bc2011 Merge pull request #23438 from techhat/gaterequests
d5b15fc6ce Gate requests import
PR #23429: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-05-07 05:35:13 UTC
3c4f734332 Merge pull request #23429 from basepi/merge-forward-2015.5
7729834d92 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
644eb75fec Merge pull request #23422 from cro/gce_sh_home
4ef9e6ba06 Don't use $HOME to find user's directory, some shells don't set it
ef17ab4b2a Merge pull request #23425 from basepi/functionwrapper_typo
c390737f3e Fix typo in FunctionWrapper
1b13ec04c2 Merge pull request #23385 from rallytime/bp-23346
9efc13c810 more linting fixes
cf131c9a5a cleaned up some pylint errors
f981699c75 added logic to sftp_file and file_map to allow folder uploads using file_map
f8c7a62089 Merge pull request #23414 from jfindlay/update_branch
8074d16d52 2015.2 -> 2015.5
54b3bd43e4 Merge pull request #23404 from hvnsweeting/cherrypy-post-emptybody-fix
f85f8f954c initialize var when POST body is empty
160f703296 Merge pull request #23409 from terminalmage/update-lithium-docstrings-2014.7
bc97d011ba Fix sphinx typo
20006b06f6 Update Lithium docstrings in 2014.7 branch
aa5fb0aa46 Merge pull request #23397 from jfindlay/fix_locale_gen
0941fefd2b add more flexible whitespace to locale_gen search
PR #23396: (basepi) [2015.2] Merge forward from 2014.7 to 2015.2 @ 2015-05-06 21:42:35 UTC
1fb84450f4 Merge pull request #23396 from basepi/merge-forward-2015.2
2766c8cb4b Fix typo in FunctionWrapper
fd09cdae6f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
0c76dd4d8a Merge pull request #23368 from kaithar/bp-23367
577f41972e Pylint fix
8d9acd1f89 Put the sed insert statement back in to the output.
3493cc1fca Merge pull request #23350 from lorengordon/file.replace_assume_line
b60e224beb Append/prepend: search for full line
7be5c48ad5 Merge pull request #23341 from cachedout/issue_23026
e98e65e787 Fix tests
6011b437ca Fix syndic pid and logfile path
ea61abfa68 Merge pull request #23272 from basepi/salt-ssh.minion.config.19114
c223309bb7 Add versionadded
be7407feae Lint
c2c337567e Missing comma
8e3e8e073a Pass the minion_opts through the FunctionWrapper
cb69cd07de Match the master config template in the master config reference
87fc3161f9 Add Salt-SSH section to master config template
91dd9dcbdc Add ssh_minion_opts to master config ref
c273ea14c6 Add minion config to salt-ssh doc
a0b6b760c3 Add minion_opts to roster docs
5212c35260 Accept minion_opts from the target information
e2099b6e1b Process ssh_minion_opts from master config
3b64214377 Revert "Work around bug in salt-ssh in config.get for gpg renderer"
494953a208 Remove the strip (embracing multi-line YAML dump)
fe87f0fe39 Dump multi-line yaml into the SHIM
b751a7281c Inject local minion config into shim if available
4f760dd9cb Merge pull request #23347 from basepi/salt-ssh.functionwrapper.contains.19114
30595e3ff7 Backport FunctionWrapper.__contains__
02658b1e60 Merge pull request #23344 from cachedout/issue_22742
5adc96ce7f Explicitly set file_client on master
ba7605d1cb Merge pull request #23318 from cellscape/honor-seed-argument
228b1be299 Honor seed argument in LXC container initializaton
4ac4509c57 Merge pull request #23307 from jfindlay/fix_locale_gen
101199ac14 check for /etc/locale.gen
f790f42ed6 Merge pull request #23324 from s0undt3ch/hotfix/bootstrap-script-2014.7
6643e47ce5 Update to the latest stable release of the bootstrap script v2015.05.04
PR #23412: (rahulhan) Adding states/win_update.py unit tests @ 2015-05-06 18:31:09 UTC
b3c16720f6 Merge pull request #23412 from rahulhan/states_win_update_unit_test
9bc1519ee7 Removed unwanted imports
f12bfcf248 Adding states/win_update.py unit tests
PR #23413: (terminalmage) Update manpages for 2015.2 -> 2015.5 @ 2015-05-06 17:12:57 UTC
f2d7646a58 Merge pull request #23413 from terminalmage/update-manpages
23fa4402dc Update manpages to reflect 2015.2 rename to 2015.5
0fdaa73c84 Fix missed docstring updates from 2015.2 -> 2015.5
4fea5ba477 Add missing RST file
PR #23410: (terminalmage) Update Lithium docstrings in 2015.2 branch @ 2015-05-06 15:53:52 UTC
PR #23409: (terminalmage) Update Lithium docstrings in 2014.7 branch (refs: #23410)
bafbea7bc7 Merge pull request #23410 from terminalmage/update-lithium-docstrings-2015.2
d395565bf7 Update Lithium docstrings in 2015.2 branch
PR #23407: (jayeshka) adding rsync unit test case @ 2015-05-06 15:52:23 UTC
02ef41a549 Merge pull request #23407 from jayeshka/rsync-unit-test
a4dd836125 adding rsync unit test case
PR #23406: (jayeshka) adding states/lxc unit test case @ 2015-05-06 15:51:50 UTC
58ec2a24c1 Merge pull request #23406 from jayeshka/lxc-states-unit-test
32a0d03093 adding states/lxc unit test case
PR #23395: (basepi) [2015.2] Add note to 2015.2.0 release notes about master opts in pillar @ 2015-05-05 22:15:20 UTC
8837d0038e Merge pull request #23395 from basepi/2015.2.0masteropts
b261c95cd6 Add note to 2015.2.0 release notes about master opts in pillar
PR #23393: (basepi) [2015.2] Add warning about python_shell changes to 2015.2.0 release notes @ 2015-05-05 22:12:46 UTC
f79aed5fe1 Merge pull request #23393 from basepi/2015.2.0python_shell
b2f033f485 Add CLI note
48e7b3ee4f Add warning about python_shell changes to 2015.2.0 release notes
PR #23380: (gladiatr72) Fix for double output with static salt cli/v2015.2 @ 2015-05-05 21:44:28 UTC
a9777761d8 Merge pull request #23380 from gladiatr72/fix_for_double_output_with_static__salt_CLI/v2015.2
c47fdd79c7 Actually removed the
staticbits from below the else: fold this time.4ee367956c Fix for incorrect output with salt CLI --static option
PR #23379: (rahulhan) Adding states/rabbitmq_cluster.py @ 2015-05-05 21:44:06 UTC
5c9543c1d2 Merge pull request #23379 from rahulhan/states_rabbitmq_cluster_test
04c22d1acf Adding states/rabbitmq_cluster.py
PR #23377: (rahulhan) Adding states/xmpp.py unit tests @ 2015-05-05 21:43:35 UTC
430f080a3a Merge pull request #23377 from rahulhan/states_xmpp_test
32923b53c3 Adding states/xmpp.py unit tests
PR #23335: (steverweber) 2015.2: include doc in master config for module_dirs @ 2015-05-05 21:28:58 UTC
8c057e6794 Merge pull request #23335 from steverweber/2015.2
5e3bae95d8 help installing python pysphere lib
97513b060a include module_dirs
36b1c87dd2 include module_dirs
PR #23362: (jayeshka) adding states/zk_concurrency unit test case @ 2015-05-05 15:50:06 UTC
1648253675 Merge pull request #23362 from jayeshka/zk_concurrency-states-unit-test
f60dda4b1d adding states/zk_concurrency unit test case
PR #23363: (jayeshka) adding riak unit test case @ 2015-05-05 14:23:05 UTC
1cdaeed868 Merge pull request #23363 from jayeshka/riak-unit-test
f9da6db459 adding riak unit test case
