2015-05-18
Version 2014.7.6 is a bugfix release for 2014.7.0.
Total Merges: 122
Total Issue References: 66
Total PR References: 166
Contributors: 49 (0xf10e, Azidburn, F30, JaseFace, JohannesEbke, aletourneau, aneeshusa, basepi, bastichelaar, bersace, cachedout, cedwards, cellscape, chris-prince, clan, clinta, cr1st1p, cro, dr4Ke, ericfode, ether42, garethgreenaway, gtmanfred, hvnsweeting, jfindlay, jleroy, joejulian, justinta, kaithar, lorengordon, martinhoefling, mguegan, multani, notpeter, panticz, rallytime, rominf, rubic, s0undt3ch, skizunov, slinu3d, t0rrant, techhat, teizz, terminalmage, thatch45, twangboy, vdesjardins, vr-jack)
CVE-2015-4017 Certificates are not verified when connecting to server in the Aliyun and Proxmox modules
Only users of the Aliyun or Proxmox cloud modules are at risk. The vulnerability does not exist in the latest 2015.5.0 release of Salt.
Generated at: 2018-05-27 20:42:49 UTC
PR #23810: (rallytime) Backport #23757 to 2014.7 @ 2015-05-18 15:30:21 UTC
ISSUE #20198: (jcftang) virt.get_graphics, virt.get_nics are broken, in turn breaking other things (refs: #23809, #21469)
PR #23809: (rallytime) Fix virtualport section of virt.get_nics loop @ 2015-05-18 15:30:09 UTC
PR #21487: (rallytime) Backport #21469 to 2014.7 (refs: #23809)
PR #21469: (vdesjardins) fixes #20198: virt.get_graphics and virt.get_nics calls in module virt (refs: #21487)
6b3352bb1a Merge pull request #23809 from rallytime/virt_get_nics_fix
0616fb7884 Fix virtualport section of virt.get_nics loop
PR #23823: (gtmanfred) add link local for ipv6 @ 2015-05-17 12:48:25 UTC
188f03f567 Merge pull request #23823 from gtmanfred/2014.7
5ef006d59d add link local for ipv6
PR #23802: (gtmanfred) if it is ipv6 ip_to_int will fail @ 2015-05-16 04:06:59 UTC
PR #23488: (cellscape) LXC cloud fixes @ 2015-05-15 18:09:35 UTC
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
ISSUE #22332: (rallytime) [salt-ssh] Add a check for host in /etc/salt/roster (refs: #23748)
PR #23748: (basepi) [2014.7] Log salt-ssh roster render errors more assertively and verbosely @ 2015-05-14 22:38:10 UTC
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
ISSUE #22959: (highlyunavailable) Windows Salt hangs if file.directory is trying to write to a drive that doesn't exist (refs: #23731)
PR #23731: (twangboy) Fixes #22959: Trying to add a directory to an unmapped drive in windows @ 2015-05-14 21:59:14 UTC
PR #23730: (rallytime) Backport #23729 to 2014.7 @ 2015-05-14 21:58:34 UTC
PR #23688: (twangboy) Added inet_pton to utils/validate/net.py for ip.set_static_ip in windows @ 2015-05-14 16:15:56 UTC
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
ISSUE #23403: (iamfil) salt.runners.cloud.action fun parameter is replaced (refs: #23680)
PR #23680: (cachedout) Rename kwarg in cloud runner @ 2015-05-13 19:44:02 UTC
1b86460d73 Merge pull request #23680 from cachedout/issue_23403
d5986c21b4 Rename kwarg in cloud runner
ISSUE #23548: (kkaig) grains.list_present produces incorrect (?) output (refs: #23674)
PR #23674: (cachedout) Handle lists correctly in grains.list_prsesent @ 2015-05-13 18:34:58 UTC
cd64af0ce4 Merge pull request #23674 from cachedout/issue_23548
da8a2f5cb3 Handle lists correctly in grains.list_prsesent
PR #23672: (twangboy) Fix user present @ 2015-05-13 18:30:09 UTC
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
ISSUE #23604: (Azidburn) service.dead on systemd Minion create an Error Message (refs: #23607)
PR #23670: (rallytime) Backport #23607 to 2014.7 @ 2015-05-13 18:27:17 UTC
ISSUE #22141: (Deshke) grains.get_or_set_hash render error if hash begins with "%" (refs: #23640)
PR #23661: (rallytime) Merge #23640 with whitespace fix @ 2015-05-13 15:47:30 UTC
ISSUE #23452: (landergate) minion crashed with empty grain (refs: #23639)
PR #23639: (cachedout) Handle exceptions raised by __virtual__ @ 2015-05-13 15:11:12 UTC
84e2ef88fc Merge pull request #23639 from cachedout/issue_23452
d418b49a77 Syntax error!
45b4015d7d Handle exceptions raised by __virtual__
ISSUE #23611: (hubez) master_type set to 'failover' but 'master' is not of type list but of type <type 'str'> (refs: #23637)
PR #23637: (cachedout) Convert str master to list @ 2015-05-13 15:08:19 UTC
bd9b94ba8c Merge pull request #23637 from cachedout/issue_23611
56cb1f52e3 Fix typo
f6fcf19a7f Convert str master to list
PR #23595: (rallytime) Backport #23549 to 2014.7 @ 2015-05-12 21:19:40 UTC
ISSUE #23110: (martinhoefling) Copying files from gitfs in file.recurse state fails (refs: #23496)
PR #23594: (rallytime) Backport #23496 to 2014.7 @ 2015-05-12 21:19:34 UTC
PR #23593: (rallytime) Backport #23442 to 2014.7 @ 2015-05-12 21:19:26 UTC
PR #23606: (twangboy) Fixed checkbox for starting service and actually starting it @ 2015-05-12 21:18:50 UTC
fadd1ef63c Merge pull request #23606 from twangboy/fix_installer
038331edab Fixed checkbox for starting service and actually starting it
ISSUE #22908: (karanjad) Add failhard option to salt orchestration (refs: #23389)
PR #23592: (rallytime) Backport #23389 to 2014.7 @ 2015-05-12 16:44:42 UTC
PR #23573: (techhat) Scan all available networks for public and private IPs (refs: #23802) @ 2015-05-12 15:22:22 UTC
cd34b9b6c4 Merge pull request #23573 from techhat/novaquery
f92db5e92f Linting
26e00d3ccc Scan all available networks for public and private IPs
ISSUE #23479: (danielmorlock) Typo in pkg.removed for Gentoo? (refs: #23558)
PR #23558: (jfindlay) reorder emerge command line @ 2015-05-12 15:17:46 UTC
2a72cd71c2 Merge pull request #23558 from jfindlay/fix_ebuild
45404fb2a6 reorder emerge command line
ISSUE #23355: (dr4Ke) salt-ssh: 'sources: salt://' files from 'pkg' state are not included in salt_state.tgz (refs: #23530)
PR #23530: (dr4Ke) salt-ssh state: fix including all salt:// references @ 2015-05-12 15:13:43 UTC
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
ISSUE #23004: (b18) 2014.7.5 - Windows - pkg.list_pkgs - "nxlog" never shows up in output. (refs: #23433)
PR #23433: (twangboy) Obtain all software from the registry @ 2015-05-11 22:47:52 UTC
55c3869861 Merge pull request #23433 from twangboy/list_pkgs_fix
8ab5b1b86f Fix pylint error
2d11d6545e Obtain all software from the registry
PR #23554: (jleroy) Debian: Hostname always updated @ 2015-05-11 21:57:00 UTC
755bed0abd Merge pull request #23554 from jleroy/debian-hostname-fix
5ff749e487 Debian: Hostname always updated
ISSUE #23411: (dr4Ke) grains.append should work at any level of a grain (refs: #23440, #23474)
PR #23551: (dr4Ke) grains.append unit tests, related to #23474 @ 2015-05-11 21:54:25 UTC
PR #23474: (dr4Ke) Fix grains.append in nested dictionary grains #23411 (refs: #23551)
PR #23440: (dr4Ke) fix grains.append in nested dictionary grains #23411 (refs: #23474)
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
ISSUE #23411: (dr4Ke) grains.append should work at any level of a grain (refs: #23440, #23474)
PR #23474: (dr4Ke) Fix grains.append in nested dictionary grains #23411 (refs: #23551) @ 2015-05-11 18:00:21 UTC
PR #23440: (dr4Ke) fix grains.append in nested dictionary grains #23411 (refs: #23474)
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
PR #23537: (t0rrant) Update changelog @ 2015-05-11 17:02:16 UTC
ab7e1aed8e Merge pull request #23537 from t0rrant/patch-1
8e03cc99d3 Update changelog
PR #23538: (cro) Update date in LICENSE file @ 2015-05-11 15:19:25 UTC
b79fed3a92 Merge pull request #23538 from cro/licupdate
345efe25c9 Update date in LICENSE file
PR #23505: (aneeshusa) Remove unused ssh config validator. Fixes #23159. @ 2015-05-09 13:24:15 UTC
ISSUE #20518: (ekle) module s3.get does not support eu-central-1 (refs: #23467)
PR #23467: (slinu3d) Added AWS v4 signature support @ 2015-05-08 14:36:19 UTC
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
PR #23444: (techhat) Add create_attach_volume to nova driver @ 2015-05-07 19:51:32 UTC
e6f9eec02e Merge pull request #23444 from techhat/novacreateattach
ebdb7eae2d Add create_attach_volume to nova driver
ISSUE #529: (rubic) run salt in user space (refs: #543)
PR saltstack/salt-bootstrap#563: (notpeter) Ubuntu alternate ppas (refs: #23460)
PR #543: (rubic) updated documentation for user, fixed configuration template links (refs: #`saltstack/salt-bootstrap#563`_)
PR #23460: (s0undt3ch) [2014.7] Update to latest stable bootstrap script v2015.05.07 @ 2015-05-07 19:10:54 UTC
e331463319 Merge pull request #23460 from s0undt3ch/hotfix/bootstrap-script-2014.7
edcd0c41f2 Update to latest stable bootstrap script v2015.05.07
PR #23439: (techhat) Add wait_for_passwd_maxtries variable @ 2015-05-07 07:28:56 UTC
7a8ce1a954 Merge pull request #23439 from techhat/maxtries
0ad3ff2c88 Add wait_for_passwd_maxtries variable
PR #23422: (cro) $HOME should not be used, some shells don't set it. @ 2015-05-06 21:02:36 UTC
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
PR #23425: (basepi) [2014.7] Fix typo in FunctionWrapper @ 2015-05-06 20:38:03 UTC
ef17ab4b2a Merge pull request #23425 from basepi/functionwrapper_typo
c390737f3e Fix typo in FunctionWrapper
PR #23385: (rallytime) Backport #23346 to 2014.7 @ 2015-05-06 20:12:29 UTC
PR #23346: (ericfode) Allow file_map in salt-cloud to handle folders. (refs: #23385)
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
PR #23414: (jfindlay) 2015.2 -> 2015.5 @ 2015-05-06 20:04:02 UTC
f8c7a62089 Merge pull request #23414 from jfindlay/update_branch
8074d16d52 2015.2 -> 2015.5
PR #23404: (hvnsweeting) saltapi cherrypy: initialize var when POST body is empty @ 2015-05-06 17:35:56 UTC
54b3bd43e4 Merge pull request #23404 from hvnsweeting/cherrypy-post-emptybody-fix
f85f8f954c initialize var when POST body is empty
PR #23409: (terminalmage) Update Lithium docstrings in 2014.7 branch @ 2015-05-06 16:20:46 UTC
160f703296 Merge pull request #23409 from terminalmage/update-lithium-docstrings-2014.7
bc97d011ba Fix sphinx typo
20006b06f6 Update Lithium docstrings in 2014.7 branch
ISSUE #17245: (tomashavlas) localemod does not generate locale for Arch (refs: #23397, #23307)
PR #23397: (jfindlay) add more flexible whitespace to locale_gen search @ 2015-05-06 03:44:11 UTC
aa5fb0aa46 Merge pull request #23397 from jfindlay/fix_locale_gen
0941fefd2b add more flexible whitespace to locale_gen search
PR #23368: (kaithar) Backport #23367 to 2014.7 @ 2015-05-05 21:42:26 UTC
PR #23367: (kaithar) Put the sed insert statement back in to the output. (refs: #23368)
PR #18368: (basepi) Merge forward from 2014.7 to develop (refs: #23368, #23367)
0c76dd4d8a Merge pull request #23368 from kaithar/bp-23367
577f41972e Pylint fix
8d9acd1f89 Put the sed insert statement back in to the output.
ISSUE #23294: (variia) file.replace fails to append if repl string partially available (refs: #23350)
PR #23350: (lorengordon) Append/prepend: search for full line @ 2015-05-05 21:42:11 UTC
3493cc1fca Merge pull request #23350 from lorengordon/file.replace_assume_line
b60e224beb Append/prepend: search for full line
ISSUE #23026: (adelcast) Incorrect salt-syndic logfile and pidfile locations (refs: #23341)
PR #23341: (cachedout) Fix syndic pid and logfile path @ 2015-05-05 21:29:10 UTC
7be5c48ad5 Merge pull request #23341 from cachedout/issue_23026
e98e65e787 Fix tests
6011b437ca Fix syndic pid and logfile path
ISSUE #19114: (pykler) salt-ssh and gpg pillar renderer (refs: #23347, #23272, #23188)
PR #23272: (basepi) [2014.7] Allow salt-ssh minion config overrides via master config and roster (refs: #23347) @ 2015-05-05 21:28:47 UTC
PR #23188: (basepi) [2014.7] Work around bug in salt-ssh in config.get for gpg renderer (refs: #23272)
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
ISSUE #19114: (pykler) salt-ssh and gpg pillar renderer (refs: #23347, #23272, #23188)
PR #23347: (basepi) [2014.7] Salt-SSH Backport FunctionWrapper.__contains__ @ 2015-05-05 14:13:21 UTC
PR #23272: (basepi) [2014.7] Allow salt-ssh minion config overrides via master config and roster (refs: #23347)
PR #23188: (basepi) [2014.7] Work around bug in salt-ssh in config.get for gpg renderer (refs: #23272)
4f760dd9cb Merge pull request #23347 from basepi/salt-ssh.functionwrapper.contains.19114
30595e3ff7 Backport FunctionWrapper.__contains__
ISSUE #22742: (hvnsweeting) salt-master says: "This master address: 'salt' was previously resolvable but now fails to resolve!" (refs: #23344)
PR #23344: (cachedout) Explicitly set file_client on master @ 2015-05-04 23:21:48 UTC
02658b1e60 Merge pull request #23344 from cachedout/issue_22742
5adc96ce7f Explicitly set file_client on master
PR #23318: (cellscape) Honor seed argument in LXC container initializaton @ 2015-05-04 20:58:12 UTC
ISSUE #17245: (tomashavlas) localemod does not generate locale for Arch (refs: #23397, #23307)
PR #23307: (jfindlay) check for /etc/locale.gen @ 2015-05-04 20:56:32 UTC
4ac4509c57 Merge pull request #23307 from jfindlay/fix_locale_gen
101199ac14 check for /etc/locale.gen
ISSUE saltstack/salt-bootstrap#580: (bradthurber) git develop broken in centos6/rhel6/others? due to missing python tornado dep (refs: #23324)
ISSUE saltstack/salt-bootstrap#560: (bradthurber) param to avoid git install on CentOS/RHEL? (refs: #23324)
ISSUE #552: (jhutchins) Support require and watch under the same state dec (refs: #23324)
PR saltstack/salt-bootstrap#589: (panticz) Fix Debian Squeeze backports mirror (refs: #23324)
PR saltstack/salt-bootstrap#504: (rominf) opensuse 13.2: fix installation (refs: #23324)
PR #567: (bastichelaar) Added upstart module (refs: #23324)
PR #23324: (s0undt3ch) [2014.7] Update to the latest stable release of the bootstrap script v2015.05.04 @ 2015-05-04 16:28:30 UTC
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 #23329: (cro) Require requests to verify cert when talking to aliyun and proxmox cloud providers @ 2015-05-04 16:18:17 UTC
5487367baa Merge pull request #23329 from cro/cloud_verify_cert
860d4b7338 Turn on ssl verify for requests.
PR #23311: (cellscape) Fix new container initialization in LXC runner (refs: #23318) @ 2015-05-04 09:55:29 UTC
ea2017672d Merge pull request #23311 from cellscape/fix-salt-cloud-lxc-init
76fbb34e7d Fix new container initialization in LXC runner
ISSUE #18880: (johtso) npm installed breaks when a module is missing (refs: #23298)
PR #23298: (chris-prince) Fixed issue #18880 in 2014.7 branch @ 2015-05-03 15:49:41 UTC
ISSUE #23148: (cr1st1p) virt - error handling bogus if machine image location is wrong (refs: #23151)
PR #23292: (rallytime) Merge #23151 with pylint fixes @ 2015-05-02 03:54:12 UTC
PR #23274: (basepi) [2014.7] Reduce salt-ssh debug log verbosity @ 2015-05-01 20:19:23 UTC
ce24315a4b Merge pull request #23274 from basepi/salt-ssh.debug.verbosity
ecee6c68f4 Log stdout and stderr to trace
08f54d79c6 Log stdout and stderr to trace as well
9b9c30f5ad Reduce salt-ssh debug log verbosity
ISSUE #22605: (mavenAtHouzz) Tornado websockets event Handlers registration are incorrect (refs: #23261)
PR #23261: (rallytime) Fix tornado websocket event handler registration @ 2015-05-01 18:20:31 UTC
7b55e4310f Merge pull request #23261 from rallytime/fix-22605
4950fbf2b3 Fix tornado websocket event handler registration
PR #23258: (teizz) TCP keepalives on the ret side, Revisited. @ 2015-05-01 16:13:49 UTC
83ef7cb114 Merge pull request #23258 from teizz/ret_keepalive_2014_7_5
0b9fb6f9be The fixes by cachedout which were backported into 2015_2 were missing a single parameter thus not setting up the TCP keepalive for the ZeroMQ Channel by default.
ISSUE #23224: (twellspring) iptables.append --log parameters must be after --jump LOG (refs: #23241)
PR #23241: (techhat) Move iptables log options after the jump @ 2015-05-01 01:31:59 UTC
8de3c83956 Merge pull request #23241 from techhat/issue23224
87f7948c99 Move iptables log options after the jump
PR #23228: (rallytime) Backport #23171 to 2014.7 @ 2015-04-30 21:09:45 UTC
ISSUE #22703: (Xiol) salt-ssh does not work with list matcher (refs: #22808)
PR #23227: (rallytime) Backport #22808 to 2014.7 @ 2015-04-30 21:09:14 UTC
PR #22823: (hvnsweeting) 22822 file directory clean @ 2015-04-30 15:25:51 UTC
82c22afacc Merge pull request #22823 from hvnsweeting/22822-file-directory-clean
c749c276b4 fix lint - remove unnecessary parenthesis
cb3dfee969 refactor
8924b5a911 refactor: use relpath instead of do it manually
d3060a51a3 refactor
5759a0e8f0 bugfix: fix file.directory clean=True when it require parent dir
ISSUE saltstack/salt#22941: (bersace) _pillar func breaks fileserver globals (refs: #22942)
ISSUE #22941: (bersace) _pillar func breaks fileserver globals (refs: #22977)
PR #22977: (bersace) Fix fileserver backends __opts__ overwritten by _pillar @ 2015-04-30 15:24:56 UTC
ISSUE #23166: (claudiupopescu) "Error in function _minion_event" resulting in modules not loaded (refs: #23180)
PR #23180: (jfindlay) fix typos from 36841bdd in masterapi.py @ 2015-04-30 15:22:41 UTC
34206f7ae3 Merge pull request #23180 from jfindlay/remote_event
72066e1073 fix typos from 36841bdd in masterapi.py
ISSUE #23153: (cr1st1p) cmdmod : run_chroot - broken in 2014.7.5 - missing kwargs (refs: #23176)
PR #23176: (jfindlay) copy standard cmd.run* kwargs into cmd.run_chroot @ 2015-04-30 15:22:12 UTC
b6b82165c8 Merge pull request #23176 from jfindlay/run_chroot
7dc3417b44 copy standard cmd.run* kwargs into cmd.run_chroot
ISSUE #23192: (joejulian) supervisord mod_watch does not accept sfun (refs: #23193)
PR #23193: (joejulian) supervisord.mod_watch should accept sfun @ 2015-04-30 04:34:21 UTC
effacbe294 Merge pull request #23193 from joejulian/2014.7_supervisord_accept_sfun
efb59f9d9d supervisord.mod_watch should accept sfun
ISSUE #19114: (pykler) salt-ssh and gpg pillar renderer (refs: #23347, #23272, #23188)
PR #23188: (basepi) [2014.7] Work around bug in salt-ssh in config.get for gpg renderer (refs: #23272) @ 2015-04-30 04:34:10 UTC
72fe88e5c6 Merge pull request #23188 from basepi/salt-ssh.function.wrapper.gpg.19114
d73979ee12 Work around bug in salt-ssh in config.get for gpg renderer
ISSUE #21480: (msciciel) TypeError: string indices must be integers, not str (refs: #23154)
PR #23154: (cachedout) Re-establish channel on interruption in fileclient @ 2015-04-29 16:18:59 UTC
168508ec2a Merge pull request #23154 from cachedout/refresh_channel
9f8dd80c38 Re-establish channel on interruption in fileclient
ISSUE #20647: (ryan-lane) file.serialize fails to serialize due to ordered dicts (refs: #20779)
PR #23146: (rallytime) Backport #20779 to 2014.7 @ 2015-04-28 20:45:06 UTC
PR #23145: (rallytime) Backport #23089 to 2014.7 @ 2015-04-28 20:44:56 UTC
ISSUE #16188: (drawks) salt.modules.parted has various functions with bogus input validation. (refs: #23124)
PR #23144: (rallytime) Backport #23124 to 2014.7 @ 2015-04-28 20:44:46 UTC
PR #23120: (terminalmage) Don't run os.path.relpath() if repo doesn't have a "root" param set @ 2015-04-28 15:46:54 UTC
a27b158153 Merge pull request #23120 from terminalmage/fix-gitfs-relpath
1860fffd68 Don't run os.path.relpath() if repo doesn't have a "root" param set
PR #23132: (clinta) Backport b27c176 @ 2015-04-28 15:00:30 UTC
fcba607978 Merge pull request #23132 from clinta/patch-2
a824d727d1 Backport b27c176
ISSUE #18476: (Auha) Upgrading salt on my master caused dependency issues (refs: #18610, #23114)
PR #23114: (rallytime) Adjust ZeroMQ 4 docs to reflect changes to Ubuntu 12 packages @ 2015-04-28 03:59:24 UTC
ISSUE #23085: (xenophonf) Use "s3fs" (not "s3") in fileserver_roots (refs: #23097)
PR #23108: (rallytime) Backport #23097 to 2014.7 @ 2015-04-28 03:58:05 UTC
ISSUE #22171: (basepi) We should only call returner.save_load once per jid (refs: #22199)
PR #23112: (basepi) [2014.7] Backport #22199 to fix mysql returner save_load errors @ 2015-04-28 03:55:44 UTC
PR #22199: (basepi) [2015.2] Put a bandaid on the save_load duplicate issue (mysql returner) (refs: #23112)
5541537c32 Merge pull request #23112 from basepi/mysql_returner_save_load
0127012ed3 Put a bandaid on the save_load duplicate issue
PR saltstack/salt#22925: (rallytime) Backport #22895 to 2014.7 (refs: #23113)
PR #23113: (rallytime) Revert "Backport #22895 to 2014.7" @ 2015-04-28 03:27:29 UTC
ISSUE #23013: (ghost) gitfs regression with authenticated repos (refs: #23094)
PR #23094: (terminalmage) pygit2: disable cleaning of stale refs for authenticated remotes @ 2015-04-27 20:51:28 UTC
21515f3c23 Merge pull request #23094 from terminalmage/issue23013
aaf7b04f79 pygit2: disable cleaning of stale refs for authenticated remotes
PR #23048: (jfindlay) py-2.6 compat for utils/boto.py ElementTree exception @ 2015-04-25 16:56:45 UTC
d45aa21dca Merge pull request #23048 from jfindlay/ET_error
64c42ccb5f py-2.6 compat for utils/boto.py ElementTree exception
ISSUE #22981: (syphernl) Locale state throwing traceback when generating not (yet) existing locale (refs: #23025)
PR #23025: (jfindlay) catch exceptions on bad system locales/encodings @ 2015-04-25 16:56:30 UTC
d25a5c102f Merge pull request #23025 from jfindlay/fix_sys_locale
9c4d62bb00 catch exceptions on bad system locales/encodings
PR #22932: (hvnsweeting) bugfix: also manipulate dir_mode when source not defined @ 2015-04-25 16:54:58 UTC
5e44b59a14 Merge pull request #22932 from hvnsweeting/file-append-bugfix
3f368de14a do not use assert in execution module
9d4fd4a8c8 bugfix: also manipulate dir_mode when source not defined
ISSUE #23021: (ether42) ps.pgrep raises NoSuchProcess (refs: #23055)
PR #23055: (jfindlay) prevent ps module errors on accessing dead procs @ 2015-04-24 22:39:49 UTC
c2416a425f Merge pull request #23055 from jfindlay/fix_ps
c2dc7adeb1 prevent ps module errors on accessing dead procs
PR #23031: (jfindlay) convert exception e.message to just e @ 2015-04-24 18:38:13 UTC
bfd9158a83 Merge pull request #23031 from jfindlay/exception
856bad1c31 convert exception e.message to just e
PR #23015: (hvnsweeting) if status of service is stop, there is not an error with it @ 2015-04-24 14:35:10 UTC
7747f3342e Merge pull request #23015 from hvnsweeting/set-non-error-lvl-for-service-status-log
92ea163513 if status of service is stop, there is not an error with it
ISSUE #22993: (jetpak) salt-minion restart causes all spawned daemons to die on centos7 (systemd) (refs: #23000)
PR #23000: (jfindlay) set systemd service killMode to process for minion @ 2015-04-24 03:42:39 UTC
2e09789156 Merge pull request #23000 from jfindlay/systemd_kill
3d575e29c4 set systemd service killMode to process for minion
ISSUE #22707: (arthurlogilab) retry_dns of master configuration is missing from the documentation (refs: #22999)
PR #22999: (justinta) Added retry_dns to minion doc. @ 2015-04-24 03:30:24 UTC
b5c059ab26 Merge pull request #22999 from jtand/fix_22707
8486e17ab3 Added retry_dns to minion doc.
PR #22990: (techhat) Use the proper cloud conf variable @ 2015-04-23 17:48:07 UTC
27dc877bfd Merge pull request #22990 from techhat/2014.7
d33bcbc2c1 Use the proper cloud conf variable
PR #22976: (multani) Improve state_output documentation @ 2015-04-23 12:24:22 UTC
13dff652c6 Merge pull request #22976 from multani/fix/state-output-doc
19efd419b5 Improve state_output documentation
PR #22955: (terminalmage) Fix regression introduced yesterday in dockerio module @ 2015-04-22 18:56:39 UTC
89fa18500c Merge pull request #22955 from terminalmage/dockerio-run-fix
b4472ad1b2 Fix regression introduced yesterday in dockerio module
PR #22954: (rallytime) Backport #22909 to 2014.7 @ 2015-04-22 18:56:20 UTC
ISSUE #18720: (Reiner030) timeouts when setting Route53 records (refs: #22856)
PR #22856: (jfindlay) increase timeout and decrease tries for route53 records @ 2015-04-22 16:47:01 UTC
c9ae593461 Merge pull request #22856 from jfindlay/route53_timeout
ba4a786984 add route53 record sync wait, default=False
ea2fd50660 increase timeout and tries for route53 records
PR #22946: (s0undt3ch) Test with a more recent pip version to avoid a traceback @ 2015-04-22 16:25:17 UTC
a178d444b8 Merge pull request #22946 from s0undt3ch/2014.7
bc87749e2c Test with a more recent pip version to avoid a traceback
ISSUE #22571: (BoomerB) same error message as on issue #18504 (refs: #22945)
PR #22945: (garethgreenaway) Fixes to scheduler @ 2015-04-22 16:25:00 UTC
de339bef0a Merge pull request #22945 from garethgreenaway/22571_2014_7_schedule_pillar_refresh_seconds_exceptions
bfa6d25ed8 Fixing a reported issue when using a scheduled job from pillar with splay. _seconds element that acted as a backup of the actual seconds was being removed when pillar was refreshed and causing exceptions. This fix moves some splay related code out of the if else condition so it's checked whether the job is in the job queue or not.
ISSUE #18843: (calvinhp) State user.present will fail to create home if user exists and homedir doesn't (refs: #22933, #22887)
PR #22887: (hvnsweeting) fix #18843 @ 2015-04-22 15:47:05 UTC
12d2b91d85 Merge pull request #22887 from hvnsweeting/18843-fix-user-present-home
7fe7b089fd run user.chhome once to avoid any side-effect when run it twice
19de9954ee clarify the usage of home arg
d6dc09af64 enhance doc, as usermod on ubuntu 12.04 will not CREATE home
0ce4d7feb6 refactor: force to use boolean
849d19edd7 log debug the creating dir process
c4e95b9f48 fix #18843: usermod won't create a dir if old home does not exist
ISSUE #21140: (holms) locale.present state executed successfully, although originally fails (refs: #22930, #22829)
PR #22930: (jfindlay) localemod.gen_locale now always returns a boolean @ 2015-04-22 15:37:39 UTC
ISSUE #18843: (calvinhp) State user.present will fail to create home if user exists and homedir doesn't (refs: #22933, #22887)
PR #22933: (hvnsweeting) add test for #18843 @ 2015-04-22 15:27:18 UTC
PR #22925: (rallytime) Backport #22895 to 2014.7 @ 2015-04-22 02:30:26 UTC
PR #22895: (aletourneau) pam_tally counter was not reset to 0 after a successful login (refs: #23113, #22925, #saltstack/salt`#22925`_)
6890752dd3 Merge pull request #22925 from rallytime/bp-22895
3852d96213 Pylint fix
90f7829ad3 Fixed pylint issues
5ebf159554 Cleaned up pull request
a08ac478f6 pam_tally counter was not reset to 0 after a successful login
ISSUE #22790: (whiteinge) jobs.list_jobs runner tracebacks on 'missing' argument (refs: #22914)
PR #22914: (cachedout) Call proper returner function in jobs.list_jobs @ 2015-04-22 00:49:01 UTC
eca37ebc11 Merge pull request #22914 from cachedout/issue_22790
d828d6fd58 Call proper returner function in jobs.list_jobs
PR #22918: (JaseFace) Add a note to the git_pillar docs stating that GitPython is the only currently supported provider @ 2015-04-22 00:48:26 UTC
44f3409b01 Merge pull request #22918 from JaseFace/git-pillar-provider-doc-note
0aee5c23d4 Add a note to the git_pillar docs stating that GitPython is the only currently supported provider
PR #22907: (techhat) Properly merge cloud configs to create profiles @ 2015-04-21 22:02:44 UTC
31c461f573 Merge pull request #22907 from techhat/cloudconfig
3bf4e66112 Properly merge cloud configs to create profiles
ISSUE #22782: (0xf10e) Turning everything into OrderedDicts broke states.keystone.user_present() (refs: #22894)
PR #22894: (0xf10e) Fix issue #22782 @ 2015-04-21 18:55:18 UTC
f0939754a0 Merge pull request #22894 from 0xf10e/2014.7
58fa24c7fa Clarify doc on kwarg 'roles' for user_present().
f0ae2eb84f Improve readability by renaming tenant_role
ISSUE #12003: (MarkusMuellerAU) [state.dockerio] docker.run TypeError: run() argument after ** must be a mapping, not str (refs: #22902)
PR #22902: (rallytime) Change state example to use proper kwarg @ 2015-04-21 18:50:47 UTC
c802ba7514 Merge pull request #22902 from rallytime/docker_doc_fix
8f703461b0 Change state example to use proper kwarg
PR #22898: (terminalmage) dockerio: better error message for native exec driver @ 2015-04-21 18:02:58 UTC
81771a7769 Merge pull request #22898 from terminalmage/issue12003
c375309434 dockerio: better error message for native exec driver
ISSUE #22825: (paolodina) Issue using file.replace in state file (refs: #22897)
PR #22897: (rallytime) Add param documentation for file.replace state @ 2015-04-21 17:31:04 UTC
e2ec4ecc55 Merge pull request #22897 from rallytime/fix-22825
9c51630002 Add param documentation for file.replace state
ISSUE saltstack/salt#22844: (bersace) LocalClient file cache confuse pillar and state files (refs: #22850)
PR #22850: (bersace) Fix pillar and salt fileserver mixed @ 2015-04-21 17:04:33 UTC
fd53889f0e Merge pull request #22850 from bersace/fix-pillar-salt-mixed
31b98e72eb Initialize state file client after pillar loading
f6bebb7a31 Use saltenv
PR #22818: (twangboy) Added documentation regarding pip in windows @ 2015-04-21 03:58:59 UTC
1380fec1b9 Merge pull request #22818 from twangboy/upd_pip_docs
cb999c7d70 Update pip.py
3cc5c970ad Added documentation regarding pip in windows
PR #22872: (rallytime) Prevent stacktrace on os.path.exists in hosts module @ 2015-04-21 02:54:40 UTC
b2bf17f5d5 Merge pull request #22872 from rallytime/fix_hosts_stacktrace
c88a1ea243 Prevent stacktrace on os.path.exists in hosts module
PR #22853: (s0undt3ch) Don't assume package installation order. @ 2015-04-21 02:42:41 UTC
03af523de9 Merge pull request #22853 from s0undt3ch/2014.7
b62df62151 Don't assume package installation order.
PR #22877: (s0undt3ch) Don't fail on make clean just because the directory does not exist @ 2015-04-21 02:40:47 UTC
9211e36564 Merge pull request #22877 from s0undt3ch/hotfix/clean-docs-fix
95d6887949 Don't fail on make clean just because the directory does not exist
PR #22873: (thatch45) Type check the version since it will often be numeric @ 2015-04-21 02:38:11 UTC
5bdbd08bbd Merge pull request #22873 from thatch45/type_check
53b8376626 Type check the version since it will often be numeric
PR #22870: (twangboy) Added ability to send a version with a space in it @ 2015-04-20 23:18:28 UTC
c965b0a035 Merge pull request #22870 from twangboy/fix_installer_again
3f180cfaae Added ability to send a version with a space in it
PR #22863: (rallytime) Backport #20974 to 2014.7 @ 2015-04-20 19:29:37 UTC
PR #20974: (JohannesEbke) Fix expr_match usage in salt.utils.check_whitelist_blacklist (refs: #22863)
2973eb18bc Merge pull request #22863 from rallytime/bp-20974
14913a4cb4 Fix expr_match usage in salt.utils.check_whitelist_blacklist
PR #22578: (hvnsweeting) gracefully handle when salt-minion cannot decrypt key @ 2015-04-20 15:24:45 UTC
c45b92bb4b Merge pull request #22578 from hvnsweeting/2014-7-fix-compile-pillar
f75b24ad68 gracefully handle when salt-minion cannot decrypt key
ISSUE #21979: (yrdevops) gitfs: error message not descriptive enough when libgit2 was compiled without libssh2 (refs: #22800)
PR #22800: (terminalmage) Improve error logging for pygit2 SSH-based remotes @ 2015-04-18 17:18:55 UTC
900c7a510f Merge pull request #22800 from terminalmage/issue21979
8f1c0084cd Clarify that for pygit2, receiving 0 objects means repo is up-to-date
98885f71d6 Add information about libssh2 requirement for pygit2 ssh auth
09468d2607 Fix incorrect log message
2093bf8d96 Adjust loglevels for gitfs errors
9d394dfe46 Improve error logging for pygit2 SSH-based remotes
PR #22813: (twangboy) Updated instructions for building salt @ 2015-04-18 04:10:07 UTC
e99f2fdb28 Merge pull request #22813 from twangboy/win_doc_fix
adc421acdd Fixed some formatting issues
8901b3b5a6 Updated instructions for building salt
ISSUE #22708: (Bilge) salt-ssh file.accumulated error: NameError: global name 'msgpack' is not defined (refs: #22810)
PR #22810: (basepi) [2014.7] More msgpack gating for salt-ssh @ 2015-04-17 22:28:24 UTC
fe1de89ad7 Merge pull request #22810 from basepi/salt-ssh.more.msgpack.gating
d4da8e66a4 Gate msgpack in salt/modules/saltutil.py
02303b22ce Gate msgpack in salt/modules/data.py
d7e8741f02 Gate salt.states.file.py msgpack
ISSUE #17144: (xpender) salt-cloud -m fails with softlayer (refs: #22803)
PR #22803: (rallytime) Allow map file to work with softlayer @ 2015-04-17 20:34:42 UTC
11df71e16d Merge pull request #22803 from rallytime/fix-17144
ce88b6ad41 Allow map file to work with softlayer
PR #22807: (rallytime) Add 2014.7.5 links to windows installation docs @ 2015-04-17 20:32:13 UTC
cd43a95212 Merge pull request #22807 from rallytime/windows_docs_update
5931a582d1 Replace all 4s with 5s
eadaead755 Add 2014.7.5 links to windows installation docs
PR #22795: (rallytime) Added release note for 2014.7.5 release @ 2015-04-17 18:05:36 UTC
0b295e2c87 Merge pull request #22795 from rallytime/release_notes
fde1feed46 Remove extra line
b19b95d992 Added release note for 2014.7.5 release
ISSUE #22740: (lorengordon) New Windows installer assumes salt is installed to the current directory (refs: #22759)
PR #22759: (twangboy) Final edits to the batch files for running salt @ 2015-04-17 04:31:15 UTC
PR #22760: (thatch45) Fix issues with the syndic @ 2015-04-17 04:30:48 UTC
20d3f2bb83 Merge pull request #22760 from thatch45/syndic_fix
e2db624b37 Fix issues with the syndic not resolving the master when the interface is set
PR #22762: (twangboy) Fixed version not showing in Add/Remove Programs @ 2015-04-17 04:29:46 UTC
54c45845ab Merge pull request #22762 from twangboy/fix_installer
4d25af8acf Fixed version not showing in Add/Remove Programs