Salt 2015.5.4 Release Notes

release:2015-08-13

Version 2015.5.4 is a bugfix release for 2015.5.0.

Bug Fixes

  • The cron.present state now correctly defaults to state ID as identifier.

Salt-Cloud Changes

  • When querying for VMs in the digital_ocean_v2 cloud driver, the number of VMs to include in a page was changed from 20 (default) to 200 to reduce the number of API calls to Digital Ocean.
  • The vmware salt-cloud driver was back-ported from the develop branch in order for installations of Salt that are older than 2015.8.0 to be able to use the vmware driver without stack-tracing on various deprecation paths that were implemented in the 2015.8.0 release.

Changelog for v2015.5.3..v2015.5.4

Generated at: 2018-05-27 21:59:14 UTC

  • PR #26292: (jquast) Rabbitmq 3.2.4 on Ubuntu has "...done.", not "...done" @ 2015-08-13 19:53:29 UTC

    • 0a5d1307c4 Merge pull request #26292 from jquast/backport-ubuntu-rabbitmq-fix
    • 39ef653bc2 Rabbitmq 3.2.4 on Ubuntu has ...done. not ...done, change the if to be more portable
  • PR #26296: (jquast) bugfix missing 'runas=None' for rabbitmqctl cmds (backport to 2015.5) @ 2015-08-13 19:52:40 UTC

    • 21cc3c3bf6 Merge pull request #26296 from jquast/bugfix-runas-rabbitmqctl-2015.5
    • eb77320786 bugfix missing 'runas=None' for rabbitmqctl cmds
  • ISSUE #25618: (twangboy) Fix reg.py to work with the registry properly (refs: #26268)

  • PR #26293: (jfindlay) Fix #26268 @ 2015-08-13 19:48:06 UTC

    • PR #26268: (twangboy) Multiple improvements to reg executionmod and state mod (refs: #26293)
    • ee59d154d7 Merge pull request #26293 from jfindlay/reggie
    • 91ea964556 add versionadded to reg exec and state mods
    • 3348b726c9 fix state/reg unit tests
    • 3f74a389ce return test results when test=True
    • a1274c438d I might have fixed some tests... I might have made them worse
    • 7393adf5a8 Fixed some lint
    • 787c88a283 Multiple improvements to reg executionmod and state mod
  • ISSUE #25192: (deuscapturus) 2015.5.2 boto_cloudwatch_alarm.present not working. (refs: #26290)

  • PR #26290: (rallytime) Only call convert_to_arn when action name is provided @ 2015-08-13 18:48:58 UTC

    • 5dd5ac1198 Merge pull request #26290 from rallytime/fix-25192
    • a1f90fa070 Only call convert_to_arn when action name is provided
  • PR #26288: (bbinet) allow to delete grains which value is False @ 2015-08-13 18:24:36 UTC

    • c81dc0b62f Merge pull request #26288 from bbinet/grains-absent-fix
    • f46722aaeb allow to delete grains which value is False
  • ISSUE #24882: (nmadhok) salt.states.openstack_config.present and salt.states.openstack_config.absent make changes when test=True (refs: #26263)

  • PR #26263: (rallytime) Don't make changes when test=True for openstack present/absent funcs @ 2015-08-13 16:30:31 UTC

    • 65ab5aa495 Merge pull request #26263 from rallytime/fix-24882
    • 86b8161d22 Mock test key in __opts__ dict
    • 298685bbb2 Don't make changes when test=True for openstack present/absent funcs
  • ISSUE #24484: (bailsman) clouds/ec2.py: create_snapshot throws exception (refs: #26265)

  • PR #26265: (rallytime) Don't stacktrace on query return in ec2.create_snapshot @ 2015-08-13 16:28:48 UTC

    • 3d1a9cfedd Merge pull request #26265 from rallytime/fix-24484
    • 4975300591 Don't stacktrace on query return in ec2.create_snapshot
  • PR #26285: (stanislavb) Remove explicit version from instance identity URL @ 2015-08-13 16:25:32 UTC

    • 5778cb3f01 Merge pull request #26285 from stanislavb/2015.5
    • 1f18f4f91e Remove explicit version from instance identity URL
  • PR #26275: (cachedout) Re-init modules on multi-master reconnect @ 2015-08-13 15:52:50 UTC

    • 679dc089c0 Merge pull request #26275 from cachedout/mm_reinit
    • 1e0473c04a Re-init modules on multi-master reconnect
  • PR #26273: (garethgreenaway) Fixes to schedule module in 2015.5 @ 2015-08-13 15:34:43 UTC

    • 75fff28779 Merge pull request #26273 from garethgreenaway/2015_5_schedule_list_show_jobs_enabled
    • 1aad4b1b4f Jobs are enabled by default but schedule.list does not show an enabled jobs as being enabled by default. This change fixes that.
  • ISSUE #24483: (bailsman) clouds/ec2.py: del_root_vol_on_destroy and del_all_vols_on_destroy not working (refs: #26271)

  • PR #26271: (rallytime) Fix del_root_vol_on_destroy and del_all_vols_on_destroy functionality on ec2 @ 2015-08-12 23:22:47 UTC

    • 10af22775a Merge pull request #26271 from rallytime/fix-24483
    • 139fbb93bc Fix del_root_vol_on_destroy and del_all_vols_on_destroy functionality on ec2
  • ISSUE #25958: (anlutro) Cron identifier does not default to state ID as documented (refs: #26219)

  • PR #26219: (anlutro) cron: make identifier default to state ID @ 2015-08-12 18:42:33 UTC

    • 8e1b5da2e0 Merge pull request #26219 from alprs/fix-cron_identifier_default
    • 1f02e1671b cron: fix a typo in the tests
    • a86b1b7f94 add release note about cron state changes
    • 9511e392ce cron: read full length of multi-line comments
    • 9b18cd9050 cron: more descriptive tests, updated to reflect new behavior
    • f22ad837c3 cron: change identifier default value to False
    • ad444b6e7b cron identifier: default to state id
  • ISSUE #26207: (fullermd) group members setting fails with obscure error message on FreeBSD (refs: #26237)

  • PR #26257: (rallytime) Back-port #26237 to 2015.5 @ 2015-08-12 18:40:35 UTC

    • PR #26237: (silenius) fix issue #26207 (refs: #26257)
    • eebcade533 Merge pull request #26257 from rallytime/bp-26237
    • d57fdbc6a0 Add versionadded to new members function
    • dad1920626 fix issue #26207
  • PR #26258: (nmadhok) Fix permission on tests/runtests.py on 2015.5 branch @ 2015-08-12 18:40:04 UTC

    • d7c8169dfb Merge pull request #26258 from nmadhok/fix-permission
    • d94485d336 Fix permission on tests/runtests.py on 2015.5 branch
  • PR #26261: (nmadhok) Correct spelling of integration in docs @ 2015-08-12 18:14:48 UTC

    • 74b70c37b7 Merge pull request #26261 from nmadhok/doc-fix-2015.5
    • 714f9766e7 Correct spelling of integration in docs
  • PR #26247: (nmadhok) Initial commit of unit tests for vmware cloud driver @ 2015-08-12 16:58:24 UTC

    • de00c181f8 Merge pull request #26247 from nmadhok/vmware-cloud-test-2015.5
    • 6cc5f97e92 Lint Fix
    • a8bfe5ec1f Initial commit of unit tests for vmware cloud driver
  • PR #26246: (nmadhok) Backport additions to VMware cloud driver from develop to 2015.5 branch @ 2015-08-12 15:11:26 UTC

    • d14d7b2c0e Merge pull request #26246 from nmadhok/vmware-cloud-driver-additions-2015.5
    • 5227aa94bc Backport additions to VMware cloud driver from develop to 2015.5 branch
  • PR #26239: (opdude) Fixed documentation to match function name @ 2015-08-12 14:48:52 UTC

    • 87b300d7b3 Merge pull request #26239 from Unity-Technologies/2015.5
    • fc18751710 Fixed documentation to match function name
  • PR #26232: (garethgreenaway) Fix to trust_key in gpg module for 2015.5. @ 2015-08-12 04:48:27 UTC

    • a93b96c9ba Merge pull request #26232 from garethgreenaway/2015_5_gpg_trust_key_fix
    • e174c41887 Fix to trust_key in gpg module for 2015.5.
  • ISSUE #25802: (jefftucker) Running module "npm.list" fails on Windows for masterless minion (refs: #26084)

  • PR #26084: (twangboy) Added python_shell=True, quoted user input @ 2015-08-10 21:29:35 UTC

    • b57da552ff Merge pull request #26084 from twangboy/fix_25802
    • 4503ed5b34 Fixed but with multiple packages, was causing tests to fail
    • f05e3e72a3 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_25802
  • PR #26183: (cro) Fix LDAP configuration issue. @ 2015-08-10 19:09:41 UTC

    • c3814137a3 Merge pull request #26183 from cro/anonldap2
    • aa5e9c80b5 Lint roller
    • 79833e3f8a Cherry pick index.rst change.
    • 99f2c27399 Documentation update for anonymous bind issue.
    • 793eed7b96 Cherry pick master.py groups check
  • PR #26186: (jacobhammons) regenerated man pages @ 2015-08-10 19:07:44 UTC

    • 3233ed4675 Merge pull request #26186 from jacobhammons/man-page-updates
    • bf2dad913f regenerated man pages
  • PR #26182: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-08-10 19:00:10 UTC

    • d48bcf7598 Merge pull request #26182 from basepi/merge-forward-2015.5
    • 32f5345d7d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
      • abdf2935c4 Merge pull request #26116 from corux/fix-escape-content
        • fd913ddc36 Append/prepend: search for full line with escaped content
      • 106356d98d Merge pull request #26088 from jacobhammons/master-finger
        • 133d5f7885 some small changes
        • d220c83f77 master_finger configuration docs switch a script to use https:// instead of http:// Refs #25751
      • 4bd4bc41f2 Merge pull request #26047 from jacobhammons/win-downloads
  • ISSUE #25998: (driskell) Event subsystem discarding required events during --batch breaking it for slow running commands (refs: #26000)

  • PR #26000: (driskell) Implement full event caching for subscribed tags @ 2015-08-10 18:57:17 UTC

    • f39780f8ce Merge pull request #26000 from driskell/fix_discarded_events
    • 65acf975dd Implement full event caching for subscribed tags Require all multitasking contexts to subscribe to their events so one call to get_event for one tag does not discard events that should be saved for a subsequent call to get_event with another tag. Use blocking get_event in batching with very small timeout. Fixes #25998
  • PR #26175: (rallytime) Back-port #26153 to 2015.5 @ 2015-08-10 18:22:32 UTC

    • PR #26153: (loa) Fix dockerio state documentation typo (refs: #26175)
    • c01b4cf150 Merge pull request #26175 from rallytime/bp-26153
    • 9a263067e9 Fix dockerio state documentation typo
  • ISSUE #26024: (jpic) lxc_conf_unset in cloud.profile is ignored (refs: #26147)

  • PR #26177: (rallytime) Back-port #26147 to 2015.5 @ 2015-08-10 18:22:01 UTC

  • ISSUE #21082: (clinta) master_type failover does not failover on DNS errors (refs: #25404)

  • PR #26179: (rallytime) Back-port #25404 to 2015.5 @ 2015-08-10 18:21:50 UTC

    • PR #25404: (DmitryKuzmenko) Fixed minion failover to next master on DNS errors. (refs: #26179)
    • 1213b8d706 Merge pull request #26179 from rallytime/bp-25404
    • 52ab9fc1fb Fixed minion failover to next master on DNS errors.
  • ISSUE #26112: (wt) state.template fails with unclear error with template with only an include (refs: #26180)

  • PR #26180: (jfindlay) fix processing of state.template @ 2015-08-10 18:21:38 UTC

    • b319c5ec04 Merge pull request #26180 from jfindlay/templ_env
    • 5e46ea4441 check type of matches in render_state before iterating
    • c80299b918 insert saltenv to render_state args in state.template
  • ISSUE #26162: (nmadhok) VMware cloud driver create function failing with traceback on latest develop (refs: #26172)

  • PR #26172: (nmadhok) [Backport] Make sure variable is a dictionary before popping something from it. @ 2015-08-10 16:42:50 UTC

    • ef5a4a47f6 Merge pull request #26172 from nmadhok/backport-cloud-fix-26163-2015.5
    • 0f2b5f8ac8 Make sure variable is a dictionary before popping something from it.
  • ISSUE #26098: (rdinoff) SALT.STATES.SLACK Doc update (refs: #26168)

  • PR #26168: (cachedout) Fix slack docs @ 2015-08-10 14:57:18 UTC

    • 2545df052a Merge pull request #26168 from cachedout/fix_slack_docs
    • f421a936dc Fix slack docs
  • ISSUE #24106: (nvx) fileclient.py#get_url ignores HTTP Auth again (2015.5 regression) (refs: #26127)

  • PR #26127: (garethgreenaway) Fixes to salt.utils.http related to cp.get_file_str bug. @ 2015-08-10 14:38:25 UTC

    • 9e6b0d6165 Merge pull request #26127 from garethgreenaway/2015_5_24106
    • 66f640086a one more lint error
    • 317a8ec75c Disabling pylint for W0633, auth should only ever be a sequence at this location.
    • 08eaca4fe4 lint fixes.
    • 7046b84ac8 Fixing a bug where cp.get_file_str would not work if using http(s) URLs with authentication. The salt.utils.http library in 2015.5 defaults to using urllib instead of requests and there was no authenitication support added. This PR adds authentication support. #24106
  • ISSUE #26141: (nmadhok) salt-cloud VMware driver fails with error in parsing configuration file (refs: #26140)

  • ISSUE #25809: (o-sleep) vmware cloud module error message (refs: #26140)

  • ISSUE #25625: (steverweber) cloud vmware driver does not provide mac_address unless vmware tools is running (refs: #26137, #26140)

  • PR #26140: (nmadhok) VMware cloud driver fixes @ 2015-08-10 13:15:58 UTC

    • 3b65e1dd91 Merge pull request #26140 from nmadhok/vmware-cloud-fixes
    • a1899b436c Correct provider name in profile example
    • 1f21876d21 Lint fixes
    • 0bd4fce9c1 Additional fixes to format_instance functions to display more information available
    • 4ee1b777e9 Change double quotes to single quotes in add_host config example
    • e132f06a5c Change double quotes to single quotes in provider configuration example
    • ad9895de07 Display error in else condition if connection is unsuccessful and does not have msg attribute. Fixes #25809
  • ISSUE #25625: (steverweber) cloud vmware driver does not provide mac_address unless vmware tools is running (refs: #26137, #26140)

  • PR #26137: (steverweber) use device mac address if vmtools not active @ 2015-08-09 03:05:36 UTC

    • 474a250414 Merge pull request #26137 from steverweber/vmware_macaddress_fix
    • 2589e389f0 use device mac address if vmtools not active
  • PR #26119: (jodv) Backport eauth bugfix to 2015.5 @ 2015-08-09 02:19:52 UTC

    • 8a33797737 Merge pull request #26119 from jodv/backport_eauth_bugfix
    • e1a7bb5e7b fix pylint error (unnecessary 'finally' clause may swallow exceptions unintentionally)
    • 5b5b4d8fe9 Fix issue with mixed user and group eauth perms
    • 0d2c6a67a5 Return all relevant perms on login
  • PR #26135: (cro) Fix proxy minions in 2015.5 and significantly update documentation. @ 2015-08-09 02:19:21 UTC

    • 2b8dcce0ca Merge pull request #26135 from cro/pm20155_2
    • 28329fff55 These tests make no sense now that the proxy interface is module based and not object based.
    • b17b65d4de Fix lint.
    • f4263c8f17 Fix lint.
    • 6927251c09 Fix lint.
    • 08f1a43ff0 Fix lint.
    • 8261158b5a Fix lint.
    • b5e643b9cd Whoops...Don't log the entire proxy dictionary--might have sensitive stuff in it.
    • 2acf3c5aa3 Remove some debugging statements, change some others to 'info' level.
    • 37de6af686 More proxy minion updates
    • e79a182108 More proxy minion updates
    • 3b746ac2f6 Update to reflect refactor to LazyLoader
    • 5d390d3a5f Updates post meeting with Rick
    • d1213ce4a0 Updates post meeting with Rick
    • dd0b7c6937 Fix proxyobject confusion, now called proxymodule
    • 9b1599d436 Update to reflect refactor to LazyLoader
  • PR #26132: (TheBigBear) minor edit @ 2015-08-08 21:05:34 UTC

    • 2705b4a36a Merge pull request #26132 from TheBigBear/patch-5
    • 1d624d77bc minor edit
  • ISSUE #25915: (ari) FreeBSD pkg install fails (refs: #26133)

  • PR #26133: (amontalban) Fixed #25915 in salt/modules/pkgng.py and salt/states/pkg.py @ 2015-08-08 21:05:05 UTC

    • 3eac28f0f9 Merge pull request #26133 from amontalban/fix-bug-25915
    • 6b0f4fca05 Fixed #25915 in salt/modules/pkgng.py and salt/states/pkg.py
  • PR #26111: (anlutro) Better error messages when virtualenv creation fails @ 2015-08-07 21:42:09 UTC

    • 19c42b8b3a Merge pull request #26111 from alprs/fix-virtualenv_fail_message
    • b2913acc48 virtualenv: better error messages when creation fails
  • ISSUE #26093: (freedba) archive.tar bug (refs: #26110)

  • PR #26110: (jfindlay) check for sources before adding them to cmd str @ 2015-08-07 21:33:23 UTC

    • 6d2835b464 Merge pull request #26110 from jfindlay/tar_sources
    • 1b2f8905eb check for sources before adding them to cmd str
  • PR #26106: (vr-jack) Update __init__.py @ 2015-08-07 21:15:55 UTC

    • 2d271b3612 Merge pull request #26106 from vr-jack/2015.5
    • 5664de6610 Update __init__.py
  • ISSUE #25983: (jmdcal) Trying to get md5 of local zip (refs: #25984)

  • PR #26101: (rallytime) Back-port #25984 to 2015.5 @ 2015-08-07 18:56:26 UTC

    • PR #25984: (jmdcal) Support local files without md5sum (refs: #26101)
    • 40d41741c1 Merge pull request #26101 from rallytime/bp-25984
    • 3d279c0713 Pylint Fix
    • cced16a9f4 Support local files without md5sum
  • PR #26080: (techhat) Fix string checking in s3fs @ 2015-08-06 23:36:09 UTC

    • 0d3c2d549e Merge pull request #26080 from techhat/fixlower
    • 8717a36963 Fix string checking in s3fs
  • ISSUE #26039: (basepi) Update scheduler docs to use orchestrate instead of overstate (refs: #26079)

  • PR #26079: (cachedout) Update docs to remove state.over @ 2015-08-06 23:35:26 UTC

    • dc9c9b5a34 Merge pull request #26079 from cachedout/issue_26039

    • f03f460af2 Update docs to remove state.over

      • 89d8faaeb1 Added python_shell=True, quoted user input
  • PR #26058: (opdude) Fix choco version on chocolatey versions below 0.9.9 @ 2015-08-06 18:50:10 UTC

    • aa023f25b8 Merge pull request #26058 from Unity-Technologies/hotfix/fix-choco-pkg-version-2015-5
    • beddb96b2b Fix choco version on chocolatey versions below 0.9.9
  • PR #26068: (jfindlay) fix autoruns.list looking in wrong directory @ 2015-08-06 18:49:48 UTC

    • fbe2584abe Merge pull request #26068 from jfindlay/auto_fix
    • 1e9a850e23 fix autoruns.list looking in wrong directory
  • ISSUE saltstack/salt-bootstrap#640: (Deshke) salt-minon install bug on ubuntu 14.04 tornado>=4.0 (refs: #26065)

  • ISSUE saltstack/salt-bootstrap#633: (neilmb) Bootstrap install fails on python-requests dependency (refs: #26065)

  • ISSUE saltstack/salt-bootstrap#632: (JulianGindi) python-requests : Depends: python-urllib3 (>= 1.7.1) but it is not installable (refs: #26065)

  • ISSUE saltstack/salt-bootstrap#631: (DavidJFelix) Stable broken in 15.04 even with -P (refs: #26065)

  • ISSUE #636: (pille) restict access to salt:// filesystem (refs: #`saltstack/salt-bootstrap#638`_)

  • ISSUE #613: (thatch45) Add timeout option to publish.publish (refs: #`saltstack/salt-bootstrap#634`_)

  • PR #26065: (s0undt3ch) [2015.5] Update to latest bootstrap stable release v2015.06.08 @ 2015-08-06 17:09:35 UTC

    • 5570408597 Merge pull request #26065 from s0undt3ch/hotfix/bootstrap-script-2015.5
    • a430a62b01 Update to latest bootstrap stable release v2015.06.08
  • ISSUE #25994: (gmcwhistler) module.ilo tempfile creation in __execute_cmd results in TypeError: cannot concatenate 'str' and 'int' objects (refs: #26061)

  • PR #26061: (gmcwhistler) Patch for issue #25994 @ 2015-08-06 17:07:34 UTC

    • 83a1922196 Merge pull request #26061 from gmcwhistler/2015.5
    • b9e89d0f2d Patch for issue #25994
  • ISSUE #26063: (saltstack-bot) not working with salt-cloud shows unknown locale error (refs: #26064)

  • PR #26064: (s0undt3ch) Don't stacktrace when trying to get the default locale. @ 2015-08-06 16:11:05 UTC

    • 073fb2bdea Merge pull request #26064 from s0undt3ch/issues/26063-unknown-locale
    • 8c6ab78b1d Don't stacktrace when trying to get the default locale.
  • PR #26048: (jacobhammons) Updated windows download links in the docs to https://repo.saltstack.com @ 2015-08-05 22:59:50 UTC

  • ISSUE #25616: (rallytime) [2015.5] Provisioning Linodes Stacktraces (refs: #26044)

  • PR #26044: (rallytime) Make sure the key we're comparing is also lowercase @ 2015-08-05 19:23:54 UTC

    • dedcadc37e Merge pull request #26044 from rallytime/fix-25616
    • c2e3803810 Make sure the key we're comparing is also lowercase
  • PR #26042: (jfindlay) fix test mode logic in state docs @ 2015-08-05 19:23:07 UTC

    • f005bdfce6 Merge pull request #26042 from jfindlay/result
    • a83059ca01 fix test mode logic in state docs
  • ISSUE #24460: (nicholascapo) Survey runner does not follow --out flag (refs: #26036)

  • PR #26036: (nicholascapo) survey.hash: Remove manually printed text @ 2015-08-05 19:21:59 UTC

    • 51ab6864b7 Merge pull request #26036 from nicholascapo/survey.hash_follow_out_flag
    • 439ee9831c survey.hash: Remove manually printed text
  • PR #26030: (opdude) Fix a bug in choco version that returned odd data @ 2015-08-05 16:30:25 UTC

    • 6a4d18eba6 Merge pull request #26030 from Unity-Technologies/hotfix/fix-choco-pkg-version-2015-5
    • 3dd96c0638 Fix a bug in choco version that returned odd data
  • PR #26032: (jfindlay) add test logic to state reult doc @ 2015-08-05 16:28:32 UTC

    • c96d3bb55e Merge pull request #26032 from jfindlay/result
    • 0fd180e106 add test logic to state reult doc
  • ISSUE #23764: (es1o) source_hash from local file is not supported. (refs: #26031, #25750)

  • PR #26031: (alekti) Revert "Add file as supported protocol for file source_hash. Fixes #23764" @ 2015-08-05 15:32:01 UTC

    • bd14d85636 Merge pull request #26031 from alekti/merge-pull-25750-to-2015.5
    • 5a7cab4dcc Revert "Add file as supported protocol for file source_hash. Fixes #23764."
  • PR #26021: (anlutro) Documentation: Specify versionadded for git.present shared argument @ 2015-08-05 14:17:38 UTC

    • d55e6e5fe9 Merge pull request #26021 from alprs/docs-git_present_shared_versionadded
    • 8fa678aaa7 specify versionadded for git.present shared argument
  • ISSUE #25701: (alekti) Issue #23764 regression (refs: #25750)

  • ISSUE #23764: (es1o) source_hash from local file is not supported. (refs: #26031, #25750)

  • PR #26020: (alekti) Correctly resolve conflict merging pull 25750 to 2015.5 @ 2015-08-05 14:16:58 UTC

    • PR #25750: (alekti) Add file as supported protocol for file source_hash. Fixes #25701. (refs: #26020)
    • 5e17c5d230 Merge pull request #26020 from alekti/merge-pull-25750-to-2015.5
    • 4b9d7426cc Add file as supported protocol for file source_hash. Fixes #23764.
  • ISSUE #22241: (masterkorp) Salt master not properly generating the map (refs: #25358)

  • PR #26016: (basepi) Revert "Deep merge of pillar lists" @ 2015-08-05 04:59:52 UTC

    • PR #25358: (dkiser) Deep merge of pillar lists (refs: #26016)
    • 53f7aadcd7 Merge pull request #26016 from basepi/revert.25358
    • 8a0e8e0460 Revert "Deep merge of pillar lists"
  • ISSUE #12255: (eliasp) 'system.set_computer_desc' fails with non-ASCII chars (refs: #25992)

  • PR #25992: (twangboy) Refactor win_system.py @ 2015-08-05 04:54:18 UTC

    • 200bff7538 Merge pull request #25992 from twangboy/fix_12255
    • 0502897635 Fixed the lint... again
    • 6f85d6b9af Fixed some lint
    • 4195803e56 Merge pull request #3 from jfindlay/win_sys
      • 9156bbd33e update win_system exec mod unit tests
    • c92add95b5 Gated ctypes import, fixed some lint
    • d7670fda0a Refactor win_service.py
  • ISSUE #25948: (twangboy) Fix uncomment function to handle spaces (refs: #26002)

  • PR #26002: (twangboy) Fixed regex to account for comment character followed by whitespace @ 2015-08-04 22:28:11 UTC

    • c168159750 Merge pull request #26002 from twangboy/fix_25948
    • ba1a57e582 Fixed regex to account for comment character followed by whitespace
  • ISSUE #25949: (godlike64) layman.add does not work with unofficial overlays (refs: #25970)

  • PR #25970: (jfindlay) accept addition of layman overlay @ 2015-08-04 15:42:28 UTC

    • 4ad2422da1 Merge pull request #25970 from jfindlay/layman
    • 237a9e18b3 accept addition of layman overlay
  • PR #25971: (basepi) [2015.5] salt.modules.reg Add spaces for strings split across multiple lines @ 2015-08-04 15:39:48 UTC

    • f136c6c1c0 Merge pull request #25971 from basepi/reg.typos
    • bb001a6c0e Add spaces for strings split across multiple lines
  • PR #25990: (rallytime) Back-port #25976 to 2015.5 @ 2015-08-04 14:36:53 UTC

    • PR #25976: (fleaflicker) Typo in help output (refs: #25990)
    • 6383dd8a7d Merge pull request #25990 from rallytime/bp-25976
    • 5f6dc0cc85 Typo in help output
  • PR #25996: (attiasr) fix msiexec package remove @ 2015-08-04 14:36:31 UTC

    • 9f8bf75dc0 Merge pull request #25996 from attiasr/patch-1
    • 5fbc5fcd94 fix msiexec package remove
  • ISSUE #25863: (peterdemin) pkg.installed fails on already installed package if it is in versionlock.list (refs: #25864)

  • PR #25966: (rallytime) Back-port #25864 to 2015.5 @ 2015-08-03 18:48:26 UTC

    • PR #25864: (peterdemin) #25863 state.pkg.installed fix (refs: #25966)
    • 2dca8d959b Merge pull request #25966 from rallytime/bp-25864
    • 0f7f9637b4 #25863 fix - state.pkg: do preflight check only for non-installed packages
  • PR #25967: (rallytime) Back-port #25917 to 2015.5 @ 2015-08-03 18:48:02 UTC

    • PR #25917: (jmdcal) adding missing format string (refs: #25967)
    • a6d8e541ed Merge pull request #25967 from rallytime/bp-25917
    • 82b7e14a1f adding missing format string
  • PR #25895: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-08-03 17:12:37 UTC

    • 87d028b302 Merge pull request #25895 from basepi/merge-forward-2015.5
    • 56e43c8f88 Fix lint
    • 93a182d9ea Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
      • d93eb87c16 Merge pull request #25750 from alekti/2014.7
        • 9ec3ae96d4 Add file as supported protocol for file source_hash. Fixes #23764.
      • 3a15df22ac Merge pull request #25704 from cachedout/master_type_2014_7
        • c95886c9a7 Ensure prior alignment with master_type in 2014.7
      • d1b9362a73 Merge pull request #25657 from MrCitron/pattern-carbon-returner-2014.7
        • f8b2f8079f Add the ability to specify a base pattern for metrics path used by the carbon returner
      • 9634351fc2 Merge pull request #25633 from AkhterAli/2014.7
        • 29be4bbe11 Update loader.py
  • ISSUE #25850: (ssgward) Need to add packages to --versions-report (refs: #25941)

  • PR #25941: (jfindlay) add timelib to dependency versions @ 2015-08-03 12:23:42 UTC

    • 98955057e0 Merge pull request #25941 from jfindlay/time_lib
    • 464f7a404c add timelib to dependency versions
  • PR #25951: (garethgreenaway) Log when event.fire and event.fire_master fail. @ 2015-08-03 00:19:45 UTC

    • dcc6883b24 Merge pull request #25951 from garethgreenaway/event_fire_failed_log_why
    • 7f20454427 If we're unable to fire an event, log the cause so we know what happened
  • ISSUE #25838: (grep4linux) docs disable_modules documentation typo (refs: #25942)

  • PR #25942: (jfindlay) typo in minion doc @ 2015-07-31 23:34:55 UTC

    • 4143cec3bf Merge pull request #25942 from saltstack/lover
    • 7e121de907 Update minion.rst
  • PR #25938: (jacobhammons) Doc on using syndic with multimaster @ 2015-07-31 23:05:05 UTC

    • PR #14690: (jacksontj) Multi syndic (refs: #25938)
    • 1f20c065b8 Merge pull request #25938 from jacobhammons/syndic-multimaster
    • ac0a8ff711 Doc on using syndic with multimaster
  • ISSUE #25839: (twangboy) ALLUSERS="1" should be a default when installing MSI's (refs: #25848)

  • PR #25848: (twangboy) Added allusers="1" when installing msi @ 2015-07-31 20:33:17 UTC

    • 18a9e65e1f Merge pull request #25848 from twangboy/fix_25839
    • e797739a1b Removed normalize_name function
    • ad7fdda68b Adder allusers="1" when installing msi
  • PR #25898: (jfindlay) clarify and expand syndic docs @ 2015-07-31 20:01:23 UTC

    • de0a0593c2 Merge pull request #25898 from jfindlay/syndic_doc
    • 4795952847 rework syndic doc
    • a25d0eabef update syndic doc to conform to style
  • ISSUE #25852: (UtahDave) Salt loader is not loading Salt vars in reactor python renderer (refs: #25927)

  • PR #25927: (jacksontj) Pass actual renderers to the Reactor's Compiler @ 2015-07-31 20:00:17 UTC

    • d1f3da548a Merge pull request #25927 from jacksontj/2015.5
    • cf7479aa0a Pass actual renderers to the Reactor's Compiler
  • ISSUE #25810: (nvx) winpkg highstate fails when a new package name contains a unicide character (refs: #25921)

  • PR #25921: (cachedout) Handle non-ascii in state log @ 2015-07-31 17:41:30 UTC

    • 331fc121a8 Merge pull request #25921 from cachedout/issue_25810
    • 8074c545ea Handle non-ascii in state log
  • PR #25919: (TheBigBear) Minor update to msi un-installer info @ 2015-07-31 17:39:48 UTC

    • 20fb8da8d4 Merge pull request #25919 from TheBigBear/patch-4
    • c994d22696 Minor update to msi un-installer info
    • PR #25982: (sjorge) salt.modules.smartos_* limit to global zone only (refs: #25905)
  • PR #25905: (rallytime) Back-port #25982 to 2015.5 @ 2015-07-30 23:24:19 UTC

    • PR #25892: (TheBigBear) Update 7-zip msi un-installer instructions (refs: #25905)
    • 9a569da4ee Merge pull request #25905 from rallytime/bp-25892
    • 333fbdde30 Update 7-zip msi un-installer instructions
  • ISSUE #25577: (yellow1912) Wrong indentation in document (refs: #25696)

  • PR #25890: (rallytime) Back-port #25698 to 2015.5 @ 2015-07-30 23:12:09 UTC

  • ISSUE #25650: (jacksontj) state.running documentation is incorrect (refs: #25894)

  • ISSUE #24042: (whiteinge) The state_events setting is not documented (refs: #25894)

  • ISSUE #23788: (k5jj) functions in drac.py module do not match documentation (refs: #25894)

  • ISSUE #21296: (Lothiraldan) Possible minion enumeration using saltutil.find_job and eauth (refs: #25894)

  • PR #25894: (jacobhammons) Minor doc bug fixes @ 2015-07-30 23:02:34 UTC

  • ISSUE #24036: (arthurlogilab) [salt-cloud] Protect against passing command line arguments as names for the --destroy command in map files (refs: #25877)

  • PR #25877: (rallytime) Protect against passing a map file in addition to VM names with --destroy @ 2015-07-30 21:55:45 UTC

    • 59e1680182 Merge pull request #25877 from rallytime/fix-24036
    • 0211972fd7 Whitespace fix
    • c6715e0404 Protect against passing a map file in addition to VM names with --destroy
    • 3aa5045138 Clean up stacktrace when referenced map file doesn't exist
  • PR #25870: (rallytime) Back-port #25824 to 2015.5 @ 2015-07-30 21:54:35 UTC

    • PR #25824: (klyr) Fix get_managed() in file.py module for local files (refs: #25870)
    • c4c9e40be6 Merge pull request #25870 from rallytime/bp-25824
    • 1fd4837beb Fix get_managed() in file.py module for local files
  • PR #25885: (t0rrant) Update Debian changelog @ 2015-07-30 20:05:59 UTC

    • af2326af68 Merge pull request #25885 from t0rrant/patch-3
    • 3f73900c61 Update Debian changelog
  • ISSUE #25478: (zyio) salt-ssh - Unable to locate current thin version (refs: #25862)

  • ISSUE #25026: (sylvia-wang) salt-ssh "Failure deploying thin" when using salt module functions (refs: #25862)

  • PR #25875: (rallytime) Back-port #25862 to 2015.5 @ 2015-07-30 17:34:02 UTC

  • PR #25873: (rallytime) Back-port #25855 to 2015.5 @ 2015-07-30 17:33:55 UTC

    • PR #25855: (puneetk) Patch 3 (refs: #25873)
    • 66dcc5525e Merge pull request #25873 from rallytime/bp-25855
    • f1f7ce25b7 Update saltmod.py
    • 23a6806008 Update saltmod.py
  • PR #25871: (rallytime) Back-port #25829 to 2015.5 @ 2015-07-30 17:33:43 UTC

    • PR #25829: (peterdemin) Fixed typo in salt.states.saltmod.function doc string (refs: #25871)
    • bf8bd38da7 Merge pull request #25871 from rallytime/bp-25829
    • a80c47ee10 Fixed typo in salt.states.saltmod.function doc string
  • ISSUE #24002: (csakoda) File lock contention on windows minions causing highstate crash (refs: #25788)

  • PR #25869: (rallytime) Back-port #25788 to 2015.5 @ 2015-07-30 17:33:33 UTC

    • PR #25788: (opdude) Catch a hard crash when running highstate on windows (refs: #25869)
    • f26310ff0b Merge pull request #25869 from rallytime/bp-25788
    • 65b18e3b34 Catch a hard crash when running highstate on windows
  • ISSUE #19532: (stolendog) salt-ssh running git clone with not root user (refs: #25853)

  • PR #25853: (davidjb) Make ssh-id-wrapper accessible to non-root users @ 2015-07-30 16:49:47 UTC

    • 810fbb8bfb Merge pull request #25853 from davidjb/ssh-id-wrapper-non-root
    • 6492bde192 Make ssh-id-wrapper accessible to non-root users
  • ISSUE #25447: (spo0nman) SaltMaster is crippled with Minion Re-Authentication (refs: #25856)

  • PR #25856: (jfindlay) expand minion reauth scalability documentation @ 2015-07-30 15:33:17 UTC

    • b6805b068a Merge pull request #25856 from jfindlay/intro_scale
    • 5921461bb1 style and usage consistency in intro_scale
    • 51dc7cacfb whitespace adjustments in intro_scale
    • 39a82467f1 expand minion reauth scalability documentation
  • ISSUE #25801: (themalkolm) Update docs that salt.states.winrepo requires roles:salt-master in grains. (refs: #25840)

  • PR #25840: (jfindlay) add note to winrepo state docs about required grain @ 2015-07-30 14:38:27 UTC

    • 423d528b73 Merge pull request #25840 from jfindlay/winrepo_master
    • b6cfd54f3b add note to winrepo state docs about required grain
  • ISSUE #25827: (0xf10e) "Deprecating Code" doesn't mention Usage of warn_until() w/ Release Names (refs: #25846)

  • PR #25846: (jfindlay) rework deprecation documentation for release names @ 2015-07-30 13:26:21 UTC

    • 754c8be719 Merge pull request #25846 from jfindlay/depr_code
    • d377f42c48 rework deprecation documentation for release names
  • ISSUE #23288: (UtahDave) cp.push fails to recreate empty files. (refs: #25833)

  • PR #25833: (jahamn) Allows cp.push to recreate empty files @ 2015-07-29 16:14:48 UTC

    • d9ab4bb989 Merge pull request #25833 from jahamn/fix-cp.push-not-recreating-empty-files
    • eac19fbf33 Allows cp.push to recreate empty files
  • ISSUE #11474: (JensRantil) pkgrepo.managed key_url: salt:// always use base env (refs: #25831)

  • PR #25831: (rallytime) Add salt:// to key_url options to docs for pkgrepo.managed @ 2015-07-29 15:38:43 UTC

    • 6f93d64784 Merge pull request #25831 from rallytime/fix-11474
    • 067ea788e9 Add salt:// to key_url options to docs for pkgrepo.managed
  • ISSUE #22699: (arthurlogilab) salt-cloud fails on KeyError when given a nonexistant action (refs: #25807)

  • PR #25807: (rallytime) Provide helpful error when using actions with a mapfile @ 2015-07-29 15:30:15 UTC

    • 72b3633383 Merge pull request #25807 from rallytime/fix-22699
    • 3f3005c746 Use handle_exception function in cloud cli.py
    • f91edf3a33 Provide helpful error when using actions with a mapfile
  • PR #25818: (jfindlay) fix autoruns list @ 2015-07-29 15:29:20 UTC

    • 71497adc0d Merge pull request #25818 from jfindlay/autoruns_users
    • c2dbb65982 fix autoruns list for modern windowsen
  • PR #25826: (anlutro) Check that "onchanges" is a list @ 2015-07-29 15:00:28 UTC

    • 98b324c5f8 Merge pull request #25826 from alprs/fix-onchanges_type_check
    • 7992a3f0f4 state.py: check that "onchanges" is a list
  • ISSUE #25258: (nickw8) windows minion repo not updating (refs: #25798)

  • PR #25798: (twangboy) Fixed stacktrace on package name not found @ 2015-07-28 22:40:14 UTC

    • ad07dc1e27 Merge pull request #25798 from twangboy/fix_25258
    • aa19c2bf8f Fixed stacktrace on package name not found
  • ISSUE #25437: (lorengordon) Stacktrace on Windows when running pkg.list_pkgs (refs: #25598, #25763)

  • PR #25797: (twangboy) Changed repocache back to cached_repo @ 2015-07-28 22:39:32 UTC

    • PR #25763: (twangboy) Fix 25437 (refs: #25797)
    • 4a38d4a606 Merge pull request #25797 from twangboy/fix_revert_in_25763
    • 81d5b5ee55 Changed repocache back to cached_repo
  • PR #25793: (rallytime) Back-port #25730 to 2015.5 @ 2015-07-28 19:37:34 UTC

    • PR #25730: (sjorge) patchelf lives in pkgsrc (refs: #25793)
    • 823f0ce350 Merge pull request #25793 from rallytime/bp-25730
    • 937779eb51 patchelf lives in pkgsrc
  • PR #25792: (rallytime) Back-port #25688 to 2015.5 @ 2015-07-28 19:37:17 UTC

    • PR #25688: (bclermont) Don't acquire lock if there is no formatter (refs: #25792)
    • 4109ae55f9 Merge pull request #25792 from rallytime/bp-25688
    • 0aa1416b6b Don't acquire lock if there is no formatter
  • PR #25796: (cachedout) Remove debug from docs @ 2015-07-28 17:35:59 UTC

    • 737fb1410c Merge pull request #25796 from cachedout/debug_doc
    • 33bfdf3b0b Remove debug from docs
  • ISSUE #24920: (voileux) module.zpool.create on character device is not possible by salt (refs: #25749)

  • PR #25749: (jahamn) Allow zpool.create on character devices @ 2015-07-28 16:01:40 UTC

    • a658753eff Merge pull request #25749 from jahamn/fix-zpool-special-char-device-support
    • 361f6cc23f Allow zpool.create on character devices
  • PR #25685: (twangboy) Fixed regex issues with comment and uncomment @ 2015-07-28 15:29:49 UTC

    • 1fae76d53c Merge pull request #25685 from twangboy/fix_25594
    • a904e8329b Fixed another test failure...
    • aa077d3a86 Fixed more tests... justin findlay helped me...
    • 87c8f8dfb5 Fixed some tests... maybe...
    • 3c1a73f16c Fixed some lint
    • b3e44e342c Fixed states to work with comment_line
    • b1cedd1153 Fixed regex issues with comment and uncomment
  • ISSUE #25437: (lorengordon) Stacktrace on Windows when running pkg.list_pkgs (refs: #25598, #25763)

  • PR #25763: (twangboy) Fix 25437 (refs: #25797) @ 2015-07-28 15:29:27 UTC

    • 0bdb29402a Merge pull request #25763 from twangboy/fix_25437
    • 9e70c800b9 The real fix for 25437 that doesn't break other crap
    • d7347e01e5 Revert "Fixed problem trying to load file with name of boolean type"
    • cf57712eeb Merge branch '2015.5' of https://github.com/saltstack/salt into fix_25437
  • PR #25752: (thatch45) State top saltenv @ 2015-07-28 01:02:10 UTC

    • c1236595f9 Merge pull request #25752 from thatch45/state_top_saltenv
    • 65d6ec0659 don't override the minion config unless requested
    • 26c858361c Add state_top_saltenv to the config chain
    • 36a3b674a7 Add raet support for state_top_saltnev
    • f6fa025b13 Add saltenv top file support to salt master_opts
    • 4a1c53309b Add state_top_saltenv support
  • ISSUE #25717: (twangboy) Problem with chocolatey module not loading (refs: #25755)

  • PR #25755: (twangboy) Fixed problem with dunder functions not being passed @ 2015-07-27 19:31:22 UTC

    • f367acb253 Merge pull request #25755 from twangboy/fix_25717
    • 10e410504d Fixed problem with dunder functions not being passed
  • ISSUE #25352: (m03) reg.absent reporting incorrect results (refs: #25648)

  • PR #25648: (twangboy) Clarified functionality of reg module, fixed state to work with new module @ 2015-07-27 19:30:33 UTC

    • f05ae95f9c Merge pull request #25648 from twangboy/fix_25352
    • d6496ce814 Merge pull request #1 from jfindlay/reg
      • 3b0cc6592a fix reg unit tests
    • b473fb7827 Fixed some tests... maybe...
    • ff7296d983 Fixed some more lint
    • 7a71f5ea6a Merge branch '2015.5' of https://github.com/saltstack/salt into fix_25352
    • f57b2b8e7a Fixed some line, added documentation
    • d78fa97a71 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_25352
    • 99d9518af8 Clarified functionality of reg module, fixed state to work with new module
  • ISSUE #25154: (uvsmtid) All data mixed on STDOUT together should generate valid JSON output (refs: #25722)

  • ISSUE #25153: (uvsmtid) Multiple results should generate valid JSON output (refs: #25722)

  • PR #25740: (rallytime) Back-port #25722 to 2015.5 @ 2015-07-27 16:08:40 UTC

    • PR #25722: (uvsmtid) Minor docs changes to emphasize JSON output problems without --static option (refs: #25740)
    • 29c66d85a4 Merge pull request #25740 from rallytime/bp-25722
    • c33eb813ea Change docs for --static option with JSON - text B
    • 89dd2ec8fb Change docs for --static option with JSON - text A
  • PR #25739: (rallytime) Back-port #25709 to 2015.5 @ 2015-07-27 16:08:27 UTC

  • PR #25738: (rallytime) Back-port #25671 to 2015.5 @ 2015-07-27 16:08:23 UTC

    • PR #25671: (niq000) added a parameter so verifying SSL is now optional instead of hard-coded (refs: #25738)
    • 095a923b6e Merge pull request #25738 from rallytime/bp-25671
    • 525cd70589 added a parameter so verifying SSL is now optional instead of hard-coded
  • ISSUE #25229: (rmatulat) Module git.latest kills target directory when test=True (refs: #25608)

  • PR #25737: (rallytime) Back-port #25608 to 2015.5 @ 2015-07-27 16:08:18 UTC

    • PR #25608: (rmatulat) Fix: prevent git.latest from removing target (refs: #25737)
    • 05fbfe64e9 Merge pull request #25737 from rallytime/bp-25608
    • df85d734bc Fix: prevent git.latest from removing target Fixes #25229 While force=True and test=True git.latest should not remove the target directory.
  • PR #25733: (davidjb) Avoid IndexError when listing mounts if mount output ends in newline @ 2015-07-27 16:08:05 UTC

    • 9817fc5556 Merge pull request #25733 from davidjb/mount-fix
    • 6d0bce2418 Test length of comps when listing mounts
  • ISSUE #22460: (onmeac) Command setm is not supported (yet) (refs: #25705)

  • PR #25705: (blackduckx) Support for setm augeas command. @ 2015-07-27 16:07:10 UTC

    • 82ba390b7b Merge pull request #25705 from blackduckx/augeas-setm
    • cad0f2b46e Augeas: fix pylint and documentation
    • ee97896cba Support for setm augeas command.
  • PR #25703: (cachedout) Return to str for master_type for 2015.5 @ 2015-07-27 16:06:22 UTC

    • f732be365d Merge pull request #25703 from cachedout/master_type_2015_5
    • 0dc28ad3e4 Return to str for master_type for 2015.5
  • ISSUE #25144: (johnccfm) user.present on Windows fails to add user to groups if group name contains a space (refs: #25702)

  • PR #25702: (twangboy) Fixed win_user module for groups with spaces in the name @ 2015-07-27 15:06:33 UTC

    • dea3d31578 Merge pull request #25702 from twangboy/fix_25144
    • d5be7a2fdf Fixed win_user moduele for groups with spaces in the name
  • ISSUE #25351: (m03) win_servermanager.list_installed failing with "IndexError: list index out of range" (refs: #25711)

  • PR #25711: (twangboy) Fixed problem with win_servermanager.list_installed @ 2015-07-27 15:05:48 UTC

    • 186af9b54d Merge pull request #25711 from twangboy/fix_25351
    • 82fa911931 Fixed problem with win_servermanager.list_installed
  • ISSUE #25435: (yee379) progressbar dependency missing (refs: #25714)

  • PR #25714: (cachedout) Display warning when progressbar can't be loaded @ 2015-07-25 00:10:13 UTC

    • ad8456eeed Merge pull request #25714 from cachedout/issue_25435
    • 44f34684ef Included note in help docs
    • 4e2fee17cc Display warning when progressbar can't be loaded
  • PR #25699: (rallytime) Back-port #25660 to 2015.5 (refs: #25709) @ 2015-07-24 22:11:40 UTC

    • PR #25660: (colekowalski) add glusterfs' direct-io-mode to mount_invisible_keys (refs: #25699, #25709)
    • a0969ff74a Merge pull request #25699 from rallytime/bp-25660
    • 85c636d7a1 add glusterfs' direct-io-mode to mount_invisible_keys
  • ISSUE #25689: (anlutro) Minion log in salt-ssh (refs: #25694)

  • PR #25694: (s0undt3ch) Salt-SSH fix for #25689 @ 2015-07-24 21:41:57 UTC

    • fe829564f4 Merge pull request #25694 from s0undt3ch/2015.5
    • afba3bde90 Use a relative un-nested path to the salt-call logfile.
    • 6309f22a65 Fix wrong variable assignment
    • c312592c81 Have cookie JAR's respect the configured cachedir
  • ISSUE #25250: (wipfs) 'force' option in copy state deletes target file (refs: #25461, #25710)

  • PR #25710: (jahamn) Integration Testcase for Issue 25250 @ 2015-07-24 20:57:33 UTC

    • fb4744b2f8 Merge pull request #25710 from jahamn/integration-test-for-issue-25250
    • 24f653e963 Integration Test for Issue 25250
  • PR #25680: (basepi) [2015.5] Move cmd.run jinja aliasing to a wrapper class to prevent side effects @ 2015-07-24 19:52:10 UTC

    • PR #25049: (terminalmage) Fix cmd.run when cross-called in a state/execution module (refs: #25680)
    • 18c9d5454d Merge pull request #25680 from basepi/jinja.alias.25049
    • e83a0f9b2b Use new-style classes
    • 4a50bac1c2 Fix typo
    • 36410389dc Name the Nitrogen release
    • 77679596f9 Make ALIASES global
    • 01c209efd9 Fix some aliases references
    • 1644641c57 Move cmd.run aliasing to a wrapper class to prevent side effects
  • PR #25682: (basepi) [2015.5] Fix parsing args with just a hash (#) @ 2015-07-24 19:52:01 UTC

    • 6a5c6dcd04 Merge pull request #25682 from basepi/fix.hash.parsing
    • 8d75c1b882 Fix parsing args with just a hash (#)
  • PR #25695: (stanislavb) Configurable AWS region & region from IAM metadata @ 2015-07-24 19:36:40 UTC

    • d330ef0d81 Merge pull request #25695 from stanislavb/expose-aws-region-config-and-fetch-region-from-metadata
    • 595da6252e Configurable AWS region & region from IAM metadata
  • PR #25645: (kev009) Fix pkgng provider to work with a sources list and the underlying pkg… @ 2015-07-24 16:33:18 UTC

    • ea0d295d49 Merge pull request #25645 from kev009/freebsd-pkgng-add
    • ee2cbb574a Fix pkgng provider to work with a sources list and the underlying pkg-add(8)
  • PR #25677: (aneeshusa) Fix pacman.list_upgrades when refresh=True. @ 2015-07-24 16:30:06 UTC

    • 2cad79c2f0 Merge pull request #25677 from aneeshusa/fix-pacman-list-upgrades-when-refreshing
    • 7062ae4eae Fix pacman.list_upgrades when refresh=True.
  • ISSUE #25674: (UtahDave) file.managed with contents parameter uses wrong line endings on Windows (refs: #25675)

  • PR #25675: (UtahDave) Use OS line endings with contents on file.managed @ 2015-07-24 16:29:50 UTC

    • 18e739b812 Merge pull request #25675 from UtahDave/2015.5local
    • d0f9d001db Use OS line endings with contents on file.managed
  • PR #25676: (basepi) Update release candidate docs to 2015.8.0rc2 @ 2015-07-23 20:29:37 UTC

    • 7914f51636 Merge pull request #25676 from basepi/2015.8.0rc2releasedocs
    • 882d11836b Update release candidate docs to 2015.8.0rc2
  • ISSUE #25665: (nmadhok) salt-cloud VMware driver fails with KeyErrors if there's any existing machine in the VMware infrastructure in (invalid state) (refs: #25666)

  • PR #25666: (nmadhok) Check if the properties exist before looping over them causing KeyError @ 2015-07-23 17:55:40 UTC

    • c36b714401 Merge pull request #25666 from nmadhok/vmware-cloud-fix_2015.5
    • 8e812296ef Check if the properties exist before looping over them causing KeyErrors Fixes #25665
  • PR #25656: (anlutro) Fix locale detection in debian/gentoo @ 2015-07-23 16:46:40 UTC

    • 36d04b2954 Merge pull request #25656 from alprs/fix-locale_detection
    • a260236942 change variable name
    • dd2a188c05 fix tests
    • aefd0fb374 code formatting
    • e58d222fb0 fix locale detection in debian/gentoo
  • PR #25661: (rallytime) Back-port #25624 to 2015.5 @ 2015-07-23 16:26:48 UTC

    • PR #25624: (bobrik) Fix typo in get_routes example for debian_ip (refs: #25661)
    • b1c1735aae Merge pull request #25661 from rallytime/bp-25624
    • 4e1fcfa15e Fix typo in get_routes example for debian_ip
  • ISSUE #15209: (hubez) file.manage: source_hash not working with s3:// (2014.7.0rc1) (refs: #25638)

  • PR #25662: (rallytime) Back-port #25638 to 2015.5 @ 2015-07-23 16:26:40 UTC

    • PR #25638: (TronPaul) fix bad merge in 99fc7ec (refs: #25662)
    • 6a2843dee2 Merge pull request #25662 from rallytime/bp-25638
    • 90d833d5dc fix bad merge 99fc7ec
  • ISSUE #25413: (zizkebab) pillar_opts default behavior is not reflected in the docs (refs: #25644)

  • PR #25644: (cachedout) pillar doc fix @ 2015-07-22 22:57:23 UTC

    • 00f4689fe3 Merge pull request #25644 from cachedout/issue_25413
    • 8cef61e6cc pillar doc fix
  • ISSUE #25540: (dennisjac) salt highstate schedule cannot be removed (refs: #25642)

  • PR #25642: (cachedout) Warn on pillar schedule delete @ 2015-07-22 22:04:12 UTC

    • aeaeb53ed6 Merge pull request #25642 from cachedout/issue_25540
    • 74f6b6930c Warn on pillar schedule delete
  • ISSUE #25437: (lorengordon) Stacktrace on Windows when running pkg.list_pkgs (refs: #25598, #25763)

  • PR #25598: (twangboy) Fixed problem trying to load file with name of boolean type @ 2015-07-22 17:07:49 UTC

    • 7b79e433f1 Merge pull request #25598 from twangboy/fix_25437
    • c53e11d42c Fixed problem trying to load file with name of boolean type
  • ISSUE #25323: (terminalmage) unit.modules.tls_test fails with older mock (refs: #25604)

  • PR #25604: (terminalmage) Move patching of mock_open to within test @ 2015-07-22 16:53:55 UTC

    • f4a38a8aee Merge pull request #25604 from terminalmage/fix-mock_open
    • 123b8ee1cb Fix mock_open patch
    • af82835f42 Move patching of mock_open to within test
  • ISSUE saltstack/salt-bootstrap#630: (jf) Ubuntu 12.04 (and maybe 12.x?): apt-get installing python-requests causes digital_ocean_v2 to fail with "[ERROR ] Failed to get the output of 'digital_ocean.avail_sizes()': 'Response' object has no attribute 'text'" (refs: #25609)

  • PR #25609: (s0undt3ch) [2015.5] Update the bootstrap script to latest release v2015.07.22 @ 2015-07-22 16:28:52 UTC

    • 224484df7e Merge pull request #25609 from s0undt3ch/hotfix/bootstrap-script-2015.5
    • 96a8568336 Update the bootstrap script to latest release v2015.07.22
  • ISSUE #21912: (rvora) pkg.latest not updating the package on CentOS though yum reports an update available (refs: #25603)

  • PR #25603: (terminalmage) Add version_cmp function to yumpkg.py @ 2015-07-22 15:42:29 UTC

    • 07eb78c79f Merge pull request #25603 from terminalmage/issue21912
    • 99e532ba74 Add versionadded directive
    • 8a1765fc6f Add version_cmp function to yumpkg.py
    • 457e72e273 Fix refernces to __salt__['version_cmp']
    • a19fa2296a Avoid using single-letter variable
  • ISSUE #25560: (dennisjac) scheduled highstate runs don't return results to the job cache (refs: #25590)

  • PR #25590: (garethgreenaway) 2015.5 scheduled jobs return data @ 2015-07-21 21:57:42 UTC

    • 69ef81caba Merge pull request #25590 from garethgreenaway/25560_2015_5_schedule_return_data
    • 19ca0c0b40 Switching default in 2015.5 for whether job data in returned to the mater job_cache.
  • PR #25584: (rallytime) Back-port #24054 and #25576 to 2015.5 @ 2015-07-21 21:16:38 UTC

    • PR #25576: (pcn) s3fs breaks when fetching files from s3 (refs: #25584)
    • PR #24054: (mgwilliams) s3.head: return useful data (refs: #25584)
    • 9ffefc867e Merge pull request #25584 from rallytime/bp-24054-and-25576
    • aa9598e3a5 s3fs breaks when fetching files from s3
    • 1667d67c3e s3.head: return useful data
  • ISSUE #23626: (mirko) salt state 'ssh_known_hosts' doesn't take 'port' into account (refs: #25589)

  • PR #25589: (jahamn) Fixes ssh_known_host not taking port into account @ 2015-07-21 21:15:06 UTC

    • a966e439d1 Merge pull request #25589 from jahamn/Fix-ssh_known_host-not-taking-port-into-account
    • 8db7ada82d Fixed pylint e8303 errors
    • 6abad29f66 Fixed pylint errors
    • 8ae6ba1290 Merge branch '2015.5' of https://github.com/saltstack/salt into Fix-ssh_known_host-not-taking-port-into-account
  • PR #25573: (EvaSDK) Do not execute bootstrap script twice @ 2015-07-21 18:20:04 UTC

    • PR #25465: (EvaSDK) 2015.5.3 LXC module fixes (refs: #25573)
    • df74f2c3ad Merge pull request #25573 from EvaSDK/2015.5.3-lxc-fixes
    • 49cec9f9a1 Use a more persistent tmp directory
    • 96a672f8e0 Do not execute bootstrap script twice
  • ISSUE #25532: (attiasr) salt/modules/win_pkg.py list_pkgs is broken (encoding issues) (refs: #25580, #25556)

  • PR #25580: (attiasr) use explicit utf-8 decoding (#25532) @ 2015-07-21 15:40:49 UTC

    • 79a809dd79 Merge pull request #25580 from attiasr/patch-1
    • 4b7dc96919 use explicit utf-8 decoding (#25532)
  • ISSUE #25206: (jfindlay) fullname issues with user.add state on windows (refs: #25568)

  • PR #25568: (twangboy) Fixed win_useradd module to add fullname @ 2015-07-21 14:30:25 UTC

    • 6edf196533 Merge pull request #25568 from twangboy/fix_25206
    • fbee445c6d Commented out a pylint error
    • 4b56dc3893 Fixed win_useradd module to add fullname
  • ISSUE #21041: (deuscapturus) state module gem.installed not working on Windows. (refs: #25430, #25561, #25428)

  • PR #25561: (twangboy) Fixed the gem module to work on windows... without injection @ 2015-07-20 21:12:15 UTC

  • PR #25521: (cachedout) Fix outputter for state.orch @ 2015-07-20 19:30:14 UTC

    • 9e19142c35 Merge pull request #25521 from cachedout/orch_outputter
    • ea40816621 Try/except
    • dd609eb440 Fix outputter for state.orch
  • PR #25563: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-07-20 19:27:36 UTC

    • 2117ac8022 Merge pull request #25563 from basepi/merge-forward-2015.5
    • 3bf2f1a722 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
    • 09ebaceca8 Merge pull request #25416 from cachedout/str_2014_7
      • cc514938a8 Fix broken keyword
  • PR #25559: (cachedout) Lint win_pkg @ 2015-07-20 17:46:29 UTC

    • 50c257b1d5 Merge pull request #25559 from cachedout/lint_win_pkg
    • 53a00add99 Lint win_pkg
  • ISSUE #25532: (attiasr) salt/modules/win_pkg.py list_pkgs is broken (encoding issues) (refs: #25580, #25556)

  • PR #25556: (attiasr) fix for #25532 @ 2015-07-20 17:45:11 UTC

    • 7c7015ccda Merge pull request #25556 from attiasr/patch-1
    • 9b224e8d4e fix for #25532
  • ISSUE #25538: (stanislavb) S3 ext_pillar configuration requires verify_ssl (refs: #25554)

  • PR #25554: (jfindlay) verify_ssl=True for s3 ext pillar @ 2015-07-20 17:43:38 UTC

    • 3c73dab2ce Merge pull request #25554 from jfindlay/verify_ssl
    • ca3ab4e737 verify_ssl=True for s3 ext pillar
  • PR #25551: (rallytime) Backport #25530 to 2015.5 @ 2015-07-20 17:43:00 UTC

  • PR #25533: (attiasr) port 445 for windows bootstraping @ 2015-07-20 15:13:06 UTC

    • 3e3441937f Merge pull request #25533 from attiasr/patch-2
    • c7fbf68597 fix windows bootstrapping
  • ISSUE #25432: (gtmanfred) [2015.5.3][raet] raet error with SaltRaetRoadStackJoiner (refs: #25525)

  • PR #25525: (gtmanfred) add make _prepare an alias for postinitio @ 2015-07-20 15:12:38 UTC

    • 7fc051f56d Merge pull request #25525 from gtmanfred/2015.5
    • 43950a5bc5 add make _prepare an alias for postinitio
  • ISSUE #25511: (rallytime) Make provider --> driver change backward compatible (refs: #25519)

  • ISSUE #23574: (CedNantes) Failed to Deploy Salt-Minion on a Win 2012 R2 using wmware Cloud Driver from Develop branch (refs: #25519)

  • PR #25519: (rallytime) Backport vmware driver to 2015.5 branch @ 2015-07-20 15:11:26 UTC

    • 725d1a40d0 Merge pull request #25519 from rallytime/backport_vmware
    • 35e13eef1d Don't reference driver in older salt versions
    • f011890217 Add vmware back-port change to release notes
    • 0f4f560b38 Backport vmware driver to 2015.5 branch
  • PR #25542: (Oro) Fix hipchat.send_message when using API v2 @ 2015-07-20 15:09:13 UTC

    • 2f0d695bc0 Merge pull request #25542 from Oro/fix-hipchat-v2-sendmessage
    • 3a9f5b037f Fix hipchat.send_message when using API v2
  • PR #25531: (rallytime) Back-port #25529 to 2015.5 @ 2015-07-18 19:16:10 UTC

    • PR #25529: (davidjb) Fix minor typo in best practice example (refs: #25531)
    • 390aa7d28f Merge pull request #25531 from rallytime/bp-25529
    • 3e24381439 Fix minor typo in best practice example
  • PR #25528: (davidjb) Fix typo in extend declaration doco @ 2015-07-18 14:22:06 UTC

    • 6e811bfdd2 Merge pull request #25528 from davidjb/patch-7
    • bfc4f9fd85 Fix typo in extend declaration doco
  • ISSUE #25486: (whiteinge) Highstate outputter not used for state.apply (refs: #25517)

  • PR #25517: (rallytime) Back-port #25486 to 2015.5 @ 2015-07-17 21:49:26 UTC

    • PR #25485: (attiasr) fix file downloads on windows
    • b9abd723a7 Merge pull request #25517 from rallytime/bp-25485
    • 6c2f3180c2 fix file downloads on windows
  • ISSUE #25479: (alexandrsushko) multiple mount.mounted of one device (refs: #25483)

  • PR #25516: (rallytime) Back-port #25483 to 2015.5 @ 2015-07-17 21:49:05 UTC

    • PR #25483: (alexandrsushko) Added 'none' to the set of specialFSes (refs: #25516)
    • 9cb436fbae Merge pull request #25516 from rallytime/bp-25483
    • e0af6e3478 Added 'none' to the set of specialFSes
  • ISSUE #25493: (blackduckx) Issue with job_args on schedule.add command (refs: #25513)

  • PR #25513: (garethgreenaway) fixes to schedule.add documentation in 2015.5 @ 2015-07-17 17:03:24 UTC

    • daf03efb7c Merge pull request #25513 from garethgreenaway/25493_2015_5_schedule_add_documentation
    • bc2414bc4d Fixing documentation for schedule.add when using the job_args parameter, value needs to be be in quotes for the value to be passed in as an array.
  • PR #25465: (EvaSDK) 2015.5.3 LXC module fixes (refs: #25573) @ 2015-07-17 15:57:54 UTC

    • 48050cd287 Merge pull request #25465 from EvaSDK/2015.5.3-lxc-fixes
    • 170eb52cc4 Fix use of undefined cmd when install of boostrap script fails
    • 86118f4a7b Install bootstrap script like dns and systemd check scripts in container
    • 978e6d56e2 Error out if configdir could not be created when preparing LXC container
    • 41b6c3c2bf Fix typo in redirecting shell output to /dev/null
    • 456393d4db Fix DNS script cleanup
  • ISSUE saltstack/salt-bootstrap#611: (BretFisher) SmartOS doesn't detect missing git, fails install (refs: #25506)

  • ISSUE saltstack/salt-bootstrap#607: (bechtoldt) (git install) change source of init scripts for debian based systems (refs: #25506)

  • ISSUE saltstack/salt-bootstrap#602: (rallytime) Ubuntu 14.10 Won't Bootstrap with Latest Stable (refs: #25506)

  • ISSUE saltstack/salt-bootstrap#598: (babilen) Installation fails on Debian 7 due to missing easy_install (refs: #25506)

  • ISSUE saltstack/salt#25456: (julienlavergne) [2015.8.0rc1] salt-bootstrap fails to install salt master (refs: #25506)

  • ISSUE saltstack/salt#25270: (iggy) [2015.8.0rc1] salt-bootstrap fails to properly install a minion (refs: #25506)

  • ISSUE #619: (syphernl) Only send over changed files during state.highstate (refs: #`saltstack/salt-bootstrap#621`_)

  • PR #25506: (s0undt3ch) [2015.5] Update bootstrap script to latest stable release, v2015.07.17 @ 2015-07-17 15:40:38 UTC

    • f85f2b49fd Merge pull request #25506 from s0undt3ch/hotfix/bootstrap-script
    • ab6aaa6e60 Update bootstrap script to latest stable release, v2015.07.17
  • ISSUE #25454: (mschiff) Regression: salt 2015.5 not working in secure chroot anymore. (refs: #25498)

  • PR #25498: (jfindlay) only read /proc/1/cmdline if it exists @ 2015-07-17 15:35:33 UTC

    • c8caf406b2 Merge pull request #25498 from jfindlay/jail_init
    • c63a6c206f only read /proc/1/cmdline if it exists
  • PR #25487: (rallytime) Back-port #25464 to 2015.5 @ 2015-07-16 16:58:36 UTC

    • PR #25464: (jquast) docfix: "cache_jobs: False" => grains_cache: False" (refs: #25487)
    • 3f695a17cf Merge pull request #25487 from rallytime/bp-25464
    • e947d8ec5a docfix: "cache_jobs: False" => grains_cache: False"
  • PR #25482: (oeuftete) Fix docker.running detection of running container @ 2015-07-16 16:58:29 UTC

    • 331808eb7d Merge pull request #25482 from oeuftete/docker-running-is-running-fix-2015-5
    • b69379ba50 Fix docker.running detection of running container
  • ISSUE #25384: (rickh563) pyopenssl 0.14 requirement in 2015.5.3 does not work in RHEL6 : ZD-364 (refs: #25468)

  • PR #25468: (joejulian) Add support for pyOpenSSL > 0.10 @ 2015-07-16 15:10:30 UTC

    • 7a20ecbf46 Merge pull request #25468 from joejulian/use_pyopenssl_0_10
    • 1b7a56aa38 Add support for pyOpenSSL > 0.10
  • PR #25467: (rallytime) Add lxml dependency to opennebula docs @ 2015-07-16 15:09:57 UTC

    • d169905170 Merge pull request #25467 from rallytime/lxml_dep
    • d326f4f686 Add lxml dependency to opennebula docs
  • ISSUE #25250: (wipfs) 'force' option in copy state deletes target file (refs: #25461, #25710)

  • ISSUE #24647: (nmadhok) salt.states.file.copy does not copy the file if it already exists with force=True (refs: #25461)

  • PR #25461: (jahamn) Update file, if force option and content not same @ 2015-07-15 20:15:07 UTC

    • 89649456e0 Merge pull request #25461 from jahamn/fixed-file.copy-force-option-deleting-files-without-updating-them
    • 32cf1ebbb5 Update file, if force option and content not same
  • ISSUE #25431: (namcois) Digital Ocean v2 reducing API calls by adding per_page (refs: #25438)

  • PR #25438: (rallytime) Reduce digital_ocean_v2 API call frequency @ 2015-07-15 19:40:18 UTC

    • 146a81b7c3 Merge pull request #25438 from rallytime/do_v2
    • faf49ea2a3 Add page number change release notes
    • da6ab82837 Reduce digital_ocean_v2 API call frequency
  • PR #25457: (jacksontj) Saltnado @ 2015-07-15 17:50:12 UTC

    • PR #25427: (tony-cocco) Saltnado runner client results in blocking call despite being set-up as Runner.async (refs: #25457)
    • cb98d79cdd Merge pull request #25457 from jacksontj/saltnado
    • bc32f66b98 Add runner_async endpoint to salnado
    • b043fa9b05 Better name of method process manager is starting
  • PR #25459: (jahamn) Fixed 'defulats' typo in verify.py @ 2015-07-15 16:53:06 UTC

    • 3f72eb5486 Merge pull request #25459 from jahamn/fix-defulats-typo-in-verify.py
    • 9bafd19f67 Fixed 'defulats' typo in verify.py
  • PR #25426: (jquast) bugfix: trailing "...done" in rabbitmq output (backport from 'develop' to 2015.5) @ 2015-07-15 14:48:05 UTC

    • 73566188cf Merge pull request #25426 from jquast/2015.5
    • 005a7ca2a3 bugfix: trailing "...done" in rabbitmq output
  • PR #25433: (jleroy) Support for IPv6 addresses scopes in network.interfaces (ifconfig) @ 2015-07-15 14:44:09 UTC

    • PR #25151: (jleroy) Support for IPv6 addresses scopes in network.interfaces (refs: #25274, #25433)
    • cfec990062 Merge pull request #25433 from jleroy/ipv6-scope-support-ifconfig
    • bc36d05c0c Support for IPv6 addresses scopes in network.interfaces (ifconfig)
  • ISSUE #21041: (deuscapturus) state module gem.installed not working on Windows. (refs: #25430, #25561, #25428)

  • PR #25430: (twangboy) Disabled rbenv execution module for Windows @ 2015-07-15 14:41:18 UTC

    • a425230c19 Merge pull request #25430 from twangboy/fix_21041_2

    • 242fc21765 Disabled rbenv execution module for Windows

      • 8b2dc681f9 Fixed the gem module to work on windows... without injection
      • c7466e7894 Fixes ssh_known_host to take port into account
  • ISSUE #1846: (seanchannel) development dependencies

  • PR #25420: (techhat) Move S3 to use AWS Signature Version 4 @ 2015-07-14 22:03:09 UTC

    • 9313804e27 Merge pull request #25420 from techhat/s3sig4
    • 3edf3a14e2 Linting
    • c63c2356be Move S3 to use AWS Signature Version 4
  • ISSUE #20441: (deuscapturus) State module file.managed returns an error on Windows and test=Test (refs: #25418)

  • PR #25418: (twangboy) Fixed problem with file.managed test=True @ 2015-07-14 21:26:59 UTC

    • 30a41d3f51 Merge pull request #25418 from twangboy/fix_20441
    • d8957856cd Fixed problem with file.managed test=True
  • PR #25417: (ahus1) extended documentation about dependencies for dig module @ 2015-07-14 20:49:51 UTC

    • 3805677e93 Merge pull request #25417 from ahus1/patch-1
    • 3cd194ebaf Update dig.py
    • 287f8f76e3 extended documentation about dependencies
  • PR #25411: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-07-14 17:55:26 UTC

    • 4d929071e1 Merge pull request #25411 from basepi/merge-forward-2015.5
    • 33d2451fef Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
    • 2a1dd1113f Merge pull request #25375 from cachedout/config_fix_2014_7
      • c041f2905f Fix error in config.py for master_type
    • 2590e23d48 Merge pull request #25324 from jacobhammons/doc-theme-updates
      • 88f5fcf58d Latest help theme updates
  • PR #25406: (anlutro) Force arguments to aptpkg.version_cmp into strings @ 2015-07-14 16:15:41 UTC

    • 81bed62d16 Merge pull request #25406 from alprs/fix-apt_version_cmp_types
    • d56efd1341 force arguments to apt_pkg.version_compare into strings
  • PR #25408: (rallytime) Back-port #25399 to 2015.5 @ 2015-07-14 16:09:06 UTC

    • PR #25399: (jarpy) Demonstrate per-minion client_acl. (refs: #25408)
    • cd9ea63ff2 Merge pull request #25408 from rallytime/bp-25399
    • da9c0eb673 Typo in client_acl ref doc.
    • 50e0baf270 Demonstrate per-minion client_acl.
  • PR #25240: (tankywoo) file make os.walk only be called one @ 2015-07-14 16:04:49 UTC

    • ef9f6b0ce0 Merge pull request #25240 from tankywoo/fix-files-os-walk-multiple-times
    • 8044def1c0 file make os.walk only be called one
  • PR #25395: (rallytime) Back-port #25389 to 2015.5 @ 2015-07-14 03:26:34 UTC

    • PR #25389: (l2ol33rt) Adding entropy note for gpg renderer (refs: #25395)
    • d02f388b08 Merge pull request #25395 from rallytime/bp-25389
    • a086e5ad35 Adding entropy note
  • PR #25392: (rallytime) Back-port #25256 to 2015.5 @ 2015-07-14 03:25:13 UTC

    • PR #25256: (yanatan16) Dont assume source_hash exists (refs: #25392)
    • 008e3295c6 Merge pull request #25392 from rallytime/bp-25256
    • 6b2da4d582 Dont assume source_hash exists
  • PR #25398: (twangboy) Fix date @ 2015-07-14 03:21:17 UTC

    • 3f278963ae Merge pull request #25398 from twangboy/fix_date
    • 52824f9602 Added /V1 /Z to remove scheduled task after run
    • a055cca79f Changed date of scheduled task to work in other locales
  • PR #25397: (GideonRed-zz) Introduce standard error output when cli exits with non-zero status @ 2015-07-14 03:20:24 UTC

    • 978d9f7117 Merge pull request #25397 from GideonRed/2015.5
    • ea7ab27f31 Introduce standard error output when cli exits with non-zero status
  • ISSUE #24444: (michaelkrupp) file.managed does not handle dead symlinks (refs: #25383)

  • PR #25386: (cachedout) Lint #25383 @ 2015-07-13 21:01:10 UTC

    • PR #25383: (jahamn) Fix manage_file function in salt/modules/file.py to handle broken sym… (refs: #25386)
    • 09442abbde Merge pull request #25386 from cachedout/lint_25383
    • 7694299170 Lint #25383
  • ISSUE #24444: (michaelkrupp) file.managed does not handle dead symlinks (refs: #25383)

  • PR #25383: (jahamn) Fix manage_file function in salt/modules/file.py to handle broken sym… (refs: #25386) @ 2015-07-13 20:58:23 UTC

    • 47bcc61f55 Merge pull request #25383 from jahamn/Fix-file.managed_not_handling_dead_symlinks
    • ab17aa160e Fix manage_file function in salt/modules/file.py to handle broken symlinks
  • PR #25369: (anlutro) Fix aptpkg.version_cmp @ 2015-07-13 20:18:45 UTC

    • c9fe10e7aa Merge pull request #25369 from alprs/fix-apt_version_cmp
    • 6391b15b3e fix aptpkg.version_cmp
  • ISSUE #25337: (eliasp) salt-call from non-existend cwd backtraces (refs: #25379)

  • PR #25379: (jfindlay) check for cwd before getting it @ 2015-07-13 19:50:27 UTC

    • beb0238392 Merge pull request #25379 from jfindlay/check_wd
    • 6e4547ff38 check for cwd before getting it
  • ISSUE #25320: (podloucky-init) zypper module list_upgrades broken (2015.5.2) (refs: #25334)

  • PR #25334: (jfindlay) return all cmd info back to zypper fcn @ 2015-07-13 17:03:29 UTC

    • 274622ad9b Merge pull request #25334 from jfindlay/fix_zyp
    • c1e633903e return all cmd info back to zypper fcn
  • PR #25339: (jfindlay) update orchestration docs @ 2015-07-13 16:04:26 UTC

    • 71859c6593 Merge pull request #25339 from jfindlay/orch_doc
    • 0447808d95 clarify, motivate orchestration docs
  • ISSUE #22241: (masterkorp) Salt master not properly generating the map (refs: #25358)

  • PR #25358: (dkiser) Deep merge of pillar lists (refs: #26016) @ 2015-07-13 15:51:01 UTC

    • 90a1ca02a3 Merge pull request #25358 from dkiser/22241_pillar_merge_lists
    • d030e289b3 Deep merge of pillar lists
  • ISSUE #25281: (shinshenjs) Unless usage in Official Doc syntax error? (refs: #25346)

  • PR #25346: (bechtoldt) set correct indention in states/requisites.rst (docs), fixes #25281 @ 2015-07-13 15:34:45 UTC

    • 66c619fd71 Merge pull request #25346 from bechtoldt/issue25281
    • 8eb2ac1dbe set correct indention in states/requisites.rst (docs), fixes #25281
  • PR #25336: (terminalmage) Don't try to read init binary if it wasn't found @ 2015-07-13 09:45:30 UTC

    • b122ed931d Merge pull request #25336 from terminalmage/fix-init-grain
    • f473918a53 Don't try to read init binary if it wasn't found
  • PR #25350: (davidjb) Fix documentation for file.blockreplace @ 2015-07-13 03:41:20 UTC

    • 1805bafc89 Merge pull request #25350 from davidjb/patch-4
    • e13a9fd74e Fix documentation for file.blockreplace
  • ISSUE #19288: (oba11) AssociatePublicIpAddress doesnt work with salt-cloud 2014.7.0 (refs: #25326, #20972)

  • PR #25326: (rallytime) Back-port #20972 to 2015.5 @ 2015-07-10 18:49:44 UTC

    • PR #20972: (JohannesEbke) Fix interface cleanup when using AssociatePublicIpAddress in #19288 (refs: #25326)
    • b0196fccb7 Merge pull request #25326 from rallytime/bp-20972
    • 51c941f59d Also fix cleanup of interfaces when using AssociatePublicIpAddress in #19288
  • ISSUE #24433: (chrimi) Salt locale state fails, if locale has not been generated (refs: #25290)

  • PR #25327: (rallytime) Back-port #25290 to 2015.5 @ 2015-07-10 18:49:37 UTC

    • PR #25290: (pcdummy) Simple fix for locale.present on Ubuntu. (refs: #25327)
    • 28450d124e Merge pull request #25327 from rallytime/bp-25290
    • 20032c55f3 Simple fix for locale.present on Ubuntu.
  • ISSUE #24827: (yermulnik) locale.present doesn't generate locales (refs: #25309)

  • PR #25328: (rallytime) Back-port #25309 to 2015.5 @ 2015-07-10 17:22:59 UTC

    • PR #25309: (davidjb) Format /etc/locale.gen correctly in salt.modules.localemod.gen_locale (refs: #25328)
    • 8f666a24f3 Merge pull request #25328 from rallytime/bp-25309
    • 44d44ec574 Format /etc/locale.gen correctly on gen_locale
  • PR #25322: (jacobhammons) version change to 2015.5.3 @ 2015-07-10 16:11:24 UTC

    • 0a33a1d8bb Merge pull request #25322 from jacobhammons/release-2015.5.3
    • 19f88920fa version change to 2015.5.3
  • PR #25308: (jacksontj) Make clear commands trace level logging @ 2015-07-10 14:20:06 UTC

    • PR #24737: (jacksontj) Move AES command logging to trace (refs: #25308)
    • 2f0f59b6cb Merge pull request #25308 from jacksontj/2015.5
    • 60fc770ba2 Make clear commands trace level logging
  • ISSUE #24520: (nvx) Tomcat module fails to extract version number from snapshot builds (2015.5 regression) (refs: #24927)

  • PR #25269: (jfindlay) Extract tomcat war version @ 2015-07-10 01:28:21 UTC

    • PR #24927: (egarbi) Tomcat module fails to extract version number from snapshot builds #2… (refs: #25269)
    • 9b6646d578 Merge pull request #25269 from jfindlay/tomcat
    • fd4fca172d consolidate tomcat exec and state version extract
    • 59dc833567 update tomcat war_deployed state tests
    • edca458b6c Fixed 2 blank lines around import re
    • 7e528d1050 Tomcat module fails to extract version number from snapshot builds #24520
  • ISSUE #18808: (amendlik) Add command line argument to select pillar environment (refs: #25238)

  • PR #25238: (DmitryKuzmenko) Pillarenv backport 2015.5 @ 2015-07-10 01:25:07 UTC

    • 0f82ac3e30 Merge pull request #25238 from DSRCompany/pillarenv_backport_2015.5
    • 98792eb179 Pillarenv support in minion config, cp and cmdmod modules.
    • 88ff576f39 Support pillarenv cmdline in state.sls. Backport of PR #23719
  • ISSUE #13943: (Supermathie) Powershell commands that expect input hang forever (refs: #25299)

  • PR #25299: (twangboy) Added -NonInteractive so powershell doesn't hang waiting for input @ 2015-07-09 21:00:16 UTC

    • 219d4cad9c Merge pull request #25299 from twangboy/fix_13943
    • c05889031f Added -NonInteractive so powershell doesn't hang waiting for input
  • PR #25301: (jacobhammons) bug fix for module function display in help @ 2015-07-09 20:46:34 UTC

    • 1c43892a80 Merge pull request #25301 from jacobhammons/doc-bugs
    • f6561289af bug fix for module function display in help
  • ISSUE #25277: (jacobhammons) CherryPy recommended versions (refs: #25279)

  • PR #25279: (jacobhammons) Additional docs on external and master job cache, assorted doc fixes @ 2015-07-09 16:46:26 UTC

    • 68149bc686 Merge pull request #25279 from jacobhammons/job-cache-docs
    • 57dfa92d5a Fixed typos
    • 2f9e5b9125 Additional docs on external and master job cache, assorted doc fixes Refs #25277
  • ISSUE #25268: (lichtamberg) Salt not working anymore in 2015.8/develop: ValueError: 'scope' is not in list (refs: #25274)

  • PR #25274: (jleroy) Fix for issue #25268 @ 2015-07-09 13:36:26 UTC

    • PR #25151: (jleroy) Support for IPv6 addresses scopes in network.interfaces (refs: #25274, #25433)
    • 972fa2fb54 Merge pull request #25274 from jleroy/25268-fix
    • 2c698d204b Fix for issue #25268
  • PR #25272: (twangboy) Fixed problem with service not starting @ 2015-07-08 23:29:48 UTC

    • 8ebb73df2d Merge pull request #25272 from twangboy/service
    • e61eeba48b Fixed problem with service not starting
  • ISSUE #25223: (nmadhok) Runner occasionally fails with a RuntimeError when fired by a reactor (refs: #25225)

  • PR #25225: (nmadhok) Backporting fix for issue #25223 on 2015.5 branch @ 2015-07-08 15:16:18 UTC

    • c6efd2356c Merge pull request #25225 from nmadhok/client-runtime-fix-backport-2015-2
    • 391b7d6730 Backporting fix for issue #25223 on 2015.2 branch
  • PR #25214: (rallytime) A couple of doc fixes for the http tutorial @ 2015-07-07 22:23:07 UTC

    • 207fbaeac4 Merge pull request #25214 from rallytime/http_doc
    • d0b61f3fc1 A couple of doc fixes for the http tutorial
  • ISSUE #24272: (rallytime) Fix boto_vpc_test moto version check (refs: #25194)

  • PR #25194: (rallytime) Update moto version check in boto_vpc_test and update min version @ 2015-07-07 18:27:32 UTC

    • 9dd5cd8a8e Merge pull request #25194 from rallytime/fix-24272
    • f959e165a1 Clean up imports
    • fbc9c0d6bf Fix Pylint
    • fe2561f415 Update moto version check in boto_vpc_test and update min version
  • PR #25205: (basepi) Update releasecandidate docs @ 2015-07-07 15:25:24 UTC

    • a3e9486c28 Merge pull request #25205 from basepi/releasecandidatedocs
    • 452880d4aa Update releasecandidate docs
  • PR #25187: (UtahDave) Doc fixes: Fix misspelling and remove extraneous double spaces @ 2015-07-07 01:07:04 UTC

    • fbafd39a46 Merge pull request #25187 from UtahDave/fix_misspelling
    • 65abb63003 remove some extraneous double spaces
    • c423b62aa5 fix misspelling
  • PR #25182: (cachedout) Try to re-pack long floats as strs @ 2015-07-07 01:06:43 UTC

    • ddee90ce23 Merge pull request #25182 from cachedout/pack_long_floats
    • a192ecfd74 Try to re-pack long ints as strs
  • ISSUE #23822: (sidcarter) Zip file extracted permissions are incorrect (refs: #25128)

  • PR #25185: (rallytime) Back-port #25128 to 2015.5 @ 2015-07-07 00:58:00 UTC

    • PR #25128: (stanislavb) Use cmd_unzip to preserve permissions (refs: #25185)
    • df9982b836 Merge pull request #25185 from rallytime/bp-25128
    • 1726057c8a Use cmd_unzip to preserve permissions
  • PR #25181: (rallytime) Back-port #25102 to 2015.5 @ 2015-07-07 00:57:13 UTC

    • PR #25102: (derBroBro) Update win_network.py (refs: #25181)
    • df0bb8c831 Merge pull request #25181 from rallytime/bp-25102
    • 64d8f14417 Update win_network.py
    • 6789c5b8e8 Update win_network.py
  • ISSUE #24301: (iggy) influxdb_user and influxdb_database states need virtual functions (refs: #25059)

  • PR #25179: (rallytime) Back-port #25059 to 2015.5 @ 2015-07-07 00:56:44 UTC

    • PR #25059: (babilen) Add virtual functions to influxdb state modules (refs: #25179)
    • 04fdd7b0ee Merge pull request #25179 from rallytime/bp-25059
    • 1eeefbd2ab Add virtual functions to influxdb state modules
  • ISSUE #18919: (giner) Windows: pkg.refresh_db returns false-positive success (refs: #25196)

  • PR #25196: (twangboy) Fixed #18919 false-positive on pkg.refresh @ 2015-07-07 00:24:13 UTC

    • 58b7d0e653 Merge pull request #25196 from twangboy/pkg_refresh
    • 12ffcd1062 Fixed #18919 false-positive on pkg.refresh
  • PR #25180: (rallytime) Back-port #25088 to 2015.5 @ 2015-07-06 20:33:45 UTC

    • PR #25088: (supertom) Update (refs: #25180)
    • 4a406aca45 Merge pull request #25180 from rallytime/bp-25088
    • 4078c8db25 added message recommending JSON file be used if the libcloud version is >= 0.17.0
  • PR #25191: (basepi) Add extrndest back to fileclient.is_cached in 2015.5 @ 2015-07-06 19:35:24 UTC

    • PR #25117: (basepi) Fix fileclient.is_cached (refs: #25191)
    • 01ed062ca7 Merge pull request #25191 from basepi/fix.fileclient.is_cached
    • 5fa74f4408 Add back in the extrndest stuff (which is now in develop)
  • ISSUE #25016: (martinhoefling) salt-run doc.execution fails with AttributeError (refs: #25020)

  • PR #25175: (rallytime) Back-port #25020 to 2015.5 @ 2015-07-06 18:53:19 UTC

  • ISSUE #21879: (bechtoldt) Reference pages in documentation are outdated again (refs: #25019, #21880)

  • ISSUE #19262: (bechtoldt) salt.pillar.file_tree doesn't appear in the documentation (refs: #25019)

  • PR #25173: (rallytime) Partial back-port of #25019 @ 2015-07-06 18:52:59 UTC

  • PR #25171: (rallytime) Back-port #25001 to 2015.5 @ 2015-07-06 18:51:53 UTC

    • PR #25001: (jasonkeene) Add docs for key arg in ssh_known_hosts.present (refs: #25171)
    • c5ba9a90ba Merge pull request #25171 from rallytime/bp-25001
    • a891108793 Add docs for key arg in ssh_known_hosts.present
  • PR #25170: (rallytime) Back-port #24982 to 2015.5 @ 2015-07-06 16:34:43 UTC

    • PR #24982: (asyncsrc) ec2 network_interfaces fix (refs: #25170)
    • 3e06602545 Merge pull request #25170 from rallytime/bp-24982
    • 3e6eab3ae9 ec2 network_interfaces fix
  • PR #25161: (aneeshusa) Allow checking for non-normalized systemd units. @ 2015-07-06 15:15:31 UTC

    • 09602808a0 Merge pull request #25161 from aneeshusa/allow-checking-non-normalized-systemd-service-availability
    • b4d544fe70 Allow checking for non-normalized systemd units.
  • PR #25151: (jleroy) Support for IPv6 addresses scopes in network.interfaces (refs: #25274, #25433) @ 2015-07-06 14:43:03 UTC

    • 3599b8abab Merge pull request #25151 from jleroy/ipv6-scope-support
    • edce034e6c Support for IPv6 addresses scopes in network.interfaces
  • ISSUE #24979: (mavenAtHouzz) [Discussion] Support for more than 1 netapi.rest_tornado server process (refs: #25149)

  • PR #25166: (cachedout) Lint #25149 @ 2015-07-06 14:40:29 UTC

  • ISSUE #24979: (mavenAtHouzz) [Discussion] Support for more than 1 netapi.rest_tornado server process (refs: #25149)

  • PR #25149: (jacksontj) Saltnado multiprocess support (refs: #25166) @ 2015-07-06 14:38:43 UTC

    • 2f1bad1c01 Merge pull request #25149 from jacksontj/saltnado
    • 6aa5548e2d Enable multiprocess support in saltnado
    • 9a1351eada Change print to logger, so we can set a level and log exc_info
  • PR #25120: (d--j) add missing continue for exception case @ 2015-07-02 19:38:45 UTC

    • a723af0f10 Merge pull request #25120 from d--j/patch-2
    • 81d5d15dce add missing continue for error case
  • PR #25117: (basepi) Fix fileclient.is_cached (refs: #25191) @ 2015-07-02 19:38:26 UTC

    • 6e2222241a Merge pull request #25117 from basepi/fix.fileclient.is_cached
    • 38e243fdfb Add fix from merge forward
    • 52f35f761a Add import
    • 23c32a7518 Backport develop version of salt.fileclient.is_cached
  • PR #25087: (0xf10e) Fix execution module for glance - now based on 2015.5! @ 2015-07-02 19:36:27 UTC

    • c80990ba4f Merge pull request #25087 from 0xf10e/fix_glance_2015.5
    • 7749cc081c PEP8 W601...
    • bbda079fa5 fix pylint E302, E502, E713, E1305
    • 3baacc72b4 use Glance API v1 for image_create
    • c3d6134da1 making pylint marginally happier
    • 19a20bf228 get valid properties for image_show() from the schema for "image"
    • 0c6a61173a add some debugging, fix a few AttributeErrors
    • aceca0e20d fix return of glance.image_show()
    • a47509e7dd fix return of image_list
    • 9f923edfab Change confusing "nt_ks" to "g_client"
    • fa2bd1a79c bit of docs/comments in image_create()
    • 5c34d0c494 merge 439b1e42053239b into 2015.5
    • 7a3cf27948 update attributes for image_show output
    • b1bec0f1a1 fix retry w/ user/pass if token fails
    • 2f4ef6683c update attributes for image_list output
    • eef3bc7048 use _auth() from neutron plus keystoneclient,
  • PR #25129: (basepi) [2015.5] Merge forward from 2014.7 to 2015.5 @ 2015-07-02 17:37:40 UTC

    • 549ee47420 Merge pull request #25129 from basepi/merge-forward-2015.5
    • 187268d879 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
    • 36d53ef59e Merge pull request #25093 from jaybocc2/2014.7
      • c6a501ebda quick fix for issue #18447
    • 38903a94a1 Merge pull request #25069 from puneetk/patch-1
    • f0b4e600e6 Update Documentation to clarify version added
    • f8dc6030e7 Pylint updates , removing whitespace
    • 532d315dd1 [Code Review update] renamed function to is_enaled from list_enabled
    • 20b0462289 Update schedule.py
    • 4f1471d7fb Add a helper module function called list_enabled
    • PR saltstack/salt#24798: (justinta) Revert "adding states/postgres_database unit test case." (refs: #25114)
    • PR saltstack/salt#24329: (jayeshka) adding states/postgres_database unit test case. (refs: #`saltstack/salt#24798`_)
  • PR #25114: (jfindlay) Revert "Revert "adding states/postgres_database unit test case."" @ 2015-07-02 01:01:29 UTC

    • 86f2791fdb Merge pull request #25114 from saltstack/revert-24798-revert-24329-postgres_database-states-unit-test
    • 071ee44d41 Revert "Revert "adding states/postgres_database unit test case.""
  • PR #24362: (jayeshka) adding states/postgres_user unit test case. @ 2015-07-01 21:45:31 UTC

    • bf8c7e7a9d Merge pull request #24362 from jayeshka/postgres_user-states-unit-test
    • fd1d834688 adding states/postgres_user unit test case.
  • PR #24361: (jayeshka) adding states/postgres_schema unit test case. @ 2015-07-01 21:44:56 UTC

    • 4195cea512 Merge pull request #24361 from jayeshka/postgres_schema-states-unit-test
    • 0558b0d744 adding states/postgres_schema unit test case.
  • PR #24331: (jayeshka) adding states/postgres_extension unit test case. @ 2015-07-01 21:43:58 UTC

    • ada8fe57d4 Merge pull request #24331 from jayeshka/postgres_extension-states-unit-test
    • 3d465a574a adding states/postgres_extension unit test case.