Salt 2015.8.9 Release Notes

Version 2015.8.9 is a bugfix release for 2015.8.0.

Statistics

Important Post-Upgrade Instructions for Linux Mint

As a result of some upstream changes, the os grain on Mint Linux is now being detected as LinuxMint (issue 33295). Run the following command after you upgrade to 2015.8.9 to reset the os grain to Mint and the os_family grain to Debian:

salt -G 'os:LinuxMint' grains.setvals "{'os': 'Mint', 'os_family': 'Debian'}"

Changelog for v2015.8.8.2..v2015.8.9

Generated at: 2018-05-28 00:36:04 UTC

  • PR #33310: (jfindlay) update 2015.8.9 release notes

  • PR #33293: (twangboy) Fix minion start retry on Windows (2015.8) @ 2016-05-17 17:03:41 UTC

    • e3eff27c55 Merge pull request #33293 from twangboy/fix_33277_2015_8

    • 652f0079db Fix minion start retry on Windows

  • ISSUE #31270: (4001982248998) acl.present: TypeError on subsequent runs (refs: #33172)

  • ISSUE #33299: (jbonachera) salt-cloud: scp_file() and sftp_file() don't work with ipv4-only hosts (refs: #33300)

  • ISSUE #33243: (jbonachera) salt-cloud: wait_for_port() doesn't work with ipv4-only hosts (refs: #33246, #33300)

  • ISSUE #26062: (silenius) service.status is broken under FreeBSD (refs: #33294)

  • ISSUE #23435: (JaseFace) service.status currently reports an error on FreeBSD if the service isn't running (refs: #33294)

  • PR #33274: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-05-16 16:41:32 UTC

    • 06edba448e Merge pull request #33274 from rallytime/merge-2015.8

    • bf641d3a66 Merge branch '2015.5' into '2015.8'

    • 8fa72f6588 Clarify file.replace MULTILINE flag interaction with regex anchors (#33137)

    • 4b1f460256 update 2015.5.11 release notes (#33236)

  • ISSUE #30258: (rallytime) Changes dictionary return should be mentioned in test state docs (refs: #33254)

    • PR #33254: (rallytime) Add comment for test=true w/o changes ret and add changes dict example

  • ISSUE #30946: (rallytime) Update SaltStack Git Policy Documentation (refs: #33252)

    • PR #33252: (rallytime) Update Git Policy docs to match Contribution guide

  • ISSUE #33238: (clinta) x509 CSR fails if the csr does not contain any extensions (refs: #33239)

  • ISSUE #30605: (eyj) Update development/conventions/release.rst docs - they're out of date with the current process. (refs: #33253)

  • PR #33253: (rallytime) Update the release process docs @ 2016-05-13 21:28:11 UTC

    • 94a53da92e Merge pull request #33253 from rallytime/fix-30605

    • a129d05b6d Update the release process docs

    • PR #33251: (jfindlay) update 2015.8.9 release notes

  • ISSUE #33243: (jbonachera) salt-cloud: wait_for_port() doesn't work with ipv4-only hosts (refs: #33246, #33300)

  • ISSUE #33073: (robnagler) TypeError: unhashable type: 'dict' (refs: #33213)

  • ISSUE #21903: (basepi) Document _file.conf pattern for master.d/ and minion.d/ (refs: #33224)

    • PR #33224: (rallytime) Make note of files that begin with '_' in master.d or minion.d dirs

  • ISSUE #31975: (rajvidhimar) Docstrings not reflected in the salt documentation. (refs: #33150)

  • ISSUE #21315: (ryan-lane) No example documentation for http.query state (refs: #33222)

  • ISSUE #29796: (vutny) Fail to use 'highstate' outputter explicitly (refs: #33215)

  • PR #33217: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-05-12 22:45:39 UTC

    • 6dc5d605b1 Merge pull request #33217 from rallytime/merge-forward-2015.8

    • 4655607b58 Merge branch '2015.5' into '2015.8'

    • 698f1eb657 Merge pull request #33211 from cachedout/user_kill

      • d4f2e5baa7 Don't try to kill a parent proc if we can't

    • f86832911e Resolve issue with pkg module on Mint Linux (#33205)

    • a09e1b6335 Add pip installed and removed test (#33178)

    • 96e3586f12 update 2015.5.11 release notes (#33197)

    • 09b072a412 Fix file.managed for Windows (#33181)

    • PR #33207: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8

  • ISSUE #32917: (bradthurber) standalone minion pygit2 pillar data doesn't refresh without manual git fetch (refs: #33204)

  • ISSUE #33162: (jfindlay) Key error with salt.utils.cloud.cache_node and EC2 (refs: #33164)

  • ISSUE #32385: (aronneagu) git.latest throws expected string or buffer (refs: #33203)

  • ISSUE #32685: (gidantribal) git state does not take into account ssh config file (refs: #33152)

  • PR #33188: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-05-11 22:32:29 UTC

    • 6177a6a36f Merge pull request #33188 from rallytime/merge-2015.8

    • f12bba6ebc Merge branch '2015.5' into '2015.8'

    • 30868ab06c [2015.5] Update to latest bootstrap script v2016.05.11 (#33185)

    • 264ad34b3b Pip fix (#33180)

    • 43288b268d add 2015.5.11 release notes (#33160)

    • e0da8fda7d [2015.5] Update to latest bootstrap script v2016.05.10 (#33155)

    • PR #33161: (jfindlay) add 2015.8.9 release notes

    • PR #33156: (rallytime) [2015.8] Update to latest bootstrap script v2016.05.10

  • ISSUE #25040: (yi9) grains.get can't get minion's /etc/salt/grains value in multi-master set up (refs: #33142)

  • ISSUE #22142: (multani) State acl.present doesn't allow setting "default" ACLs (refs: #31769)

  • PR #33144: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-05-10 19:40:31 UTC

    • 2800762b44 Merge pull request #33144 from rallytime/merge-2015.8

    • 449176f06e Merge branch '2015.5' into '2015.8'

    • 6cd1641840 Merge pull request #33141 from jtand/disable_local_pkg_install_test

      • 8b1e34fb17 Skipping salt-call --local test

  • PR #33140: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-05-10 16:57:55 UTC

    • 72d075e14e Merge pull request #33140 from rallytime/merge-2015.8

    • c732c8104b Merge branch '2015.5' into '2015.8'

    • 878d34a865 Doc mock decorators (#33132)

  • ISSUE #32834: (beardedeagle) Masterless Minion - Unable to query job cache (refs: #33017, #33100)

  • ISSUE #33058: (aclemetson) Unable to run "win_servermanager.list_available" on minion. (refs: #33099)

  • ISSUE #32999: (basepi) Stacktrace for master_finger mismatch on minion (refs: #33106)

  • PR #33106: (abednarik) Moved _finger_fail method to parent class. @ 2016-05-09 16:31:09 UTC

    • 8acc3147d6 Merge pull request #33106 from abednarik/abednarik_master_Finger_stacktrace

    • 91a69ba54a Moved _finger_fail method to parent class.

    • PR #33102: (Ch3LL) clarify docs that map is designed to be run once. is not stateful

    • PR #33098: (rallytime) Back-port #33061 to 2015.8

    • PR #33061: (ahammond) cloud.query needs to define mapper.opts (refs: #33098)

  • PR #33096: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-05-06 19:27:57 UTC

    • c1f7aed8a5 Merge pull request #33096 from rallytime/merge-2015.8

    • 0fd5e9d157 Merge branch '2015.5' into '2015.8'

    • 30edeadafd Lower display of msgpack failure msg to debug (#33078)

    • d4928c5a22 Use saltstack repo in buildpackage.py on CentOS 5 (#33080)

    • 61d126cb98 add test for installing package while using salt-call --local (#33025)

    • 6d3e4e8935 File and User test fixes for 2015.5 on Fedora23 (#33055)

    • d48b2b8b52 test pillar.items output (#33060)

    • 398793bfc0 Fix minor document error of test.assertion (#33067)

    • f8757631b2 Saltfile with pillar tests (#33045)

    • 1d7892421e Backport #33021 manually to 2015.5 (#33044)

    • f00b5f91b3 Add run_on_start docs to schedule.rst (#32958)

    • PR #32865: (idonin) salt-cloud: fix ipv6-only virtual machines

    • PR #33084: (jfindlay) modules.npm: do not log npm --version at info level

  • ISSUE #33068: (pythonwood) salt-ssh do not support centos5 because old-version-python ? (refs: #33081)

  • PR #33081: (jfindlay) ssh docs: install py-2.6 for RHEL 5 @ 2016-05-06 15:18:39 UTC

    • 3808d05838 Merge pull request #33081 from jfindlay/ssh_doc

    • a2c927b173 ssh docs: install py-2.6 for RHEL 5

  • PR #33088: (isbm) Bugfix: Restore boolean values from the repo configuration @ 2016-05-06 15:13:27 UTC

    • 6d604926d3 Merge pull request #33088 from isbm/isbm-zypper-fix-booleans

    • 3ca203eb8e Bugfix (follow-up): setting priority requires non-positive integer

    • 79a46e091c Add repo config test

    • 222b8369ca Add test data for repos

    • b746fa35f0 Bugfix: Restore boolean values from the repo configuration

  • ISSUE #12422: (creaky) Bug: file.blockreplace inserts additional blank line on multi-line content (refs: #33049)

    • PR #33082: (Ch3LL) Fix tests for file.blockplace to remove newline

    • PR #33049: (thatch45) Don't append a newline when creating new content with blockreplace (refs: #33082)

  • PR #32892: (isbm) Resolve Zypper locks on asynchronous calls @ 2016-05-05 14:34:59 UTC

    • fb89877cf2 Merge pull request #32892 from isbm/isbm-zypper-env-variables

    • 1601a7e07a Prevent the use of "refreshable" together with "nolock" option.

    • 52e1be2fa9 Remove unused variable in a constructor. Adjust the docstring accordingly.

    • 7e00f566ef Move log message down to the point where it actually sleeps. Rephrase the message.

    • 4b7dab83ff Fix PID file path for SLE11

    • 7f37961d4b Rename tags

    • c55b0fab58 Test DOM parsing

    • c54e928e4f Add exception handling test

    • 3d245bbe84 Parse DOM out of the box, when XML mode is called

    • 6a98f523ac Add Zypper caller test suite

    • f189f90124 Bugfix: always trigger __getattr__ to reset and increment the configuration before the call.

    • 7e1712dd80 Fix tests according to the new calling model

    • 3a30b7fbcd Remove an obsolete test case

    • 6e5877a2ee Add Zypper Call mock

    • bb5540cb4a Bugfix: inverted logic on raising (or not) exceptions

    • ce9262fe71 Make Zypper caller module-level reusable

    • 77dc8695af Update docstrings according to the bugfix

    • 46d86b21d5 Bugfix: accept refresh override param

    • cb40618262 Fire an event about released Zypper with its result

    • 0728f0bc00 Replace string values with the constants

    • 6af3f7141b Check if zypper lock exists and add more debug logging

    • 0167b30a75 Add Zypper lock constant

    • 370ff21d36 Fire an event to the Master about blocked Zypper.

    • 1727ca3de2 Use new Zypper call implementation

    • 485164aa5c Remove blocking-prone Zypper call implementation

    • f161f0612c Implement block-proof Zypper call implementation

    • baf35ed708 Remove one-char variables

    • 2c94eb016f Remove an unused variable

    • 6869ebc557 Remove an empty line

    • 7e06489da9 Remove verbose wrapping

    • 2131ff04af Standarize zypper call to "run_all"

    • 046ef44ca3 Bugfix: version_cmp crashes in CLI if there are versions, that looks like integer or float.

    • b869a92eea Change Zypper calls to a single point

  • ISSUE #24237: (Grokzen) Minion schedule return data missing some fields (refs: #33039)

  • ISSUE #12422: (creaky) Bug: file.blockreplace inserts additional blank line on multi-line content (refs: #33049)

    • PR #33049: (thatch45) Don't append a newline when creating new content with blockreplace (refs: #33082)

  • ISSUE #24996: (danlsgiga) --failhard option not working as expected (refs: #33048)

    • PR #33048: (rallytime) Pass all data to batch.run() call when using --failhard

  • ISSUE #32452: (nicholascapo) cmd.run_all with --batch and --failhard gives no output on failure (refs: #33050)

    • PR #33050: (rallytime) Display command output when command fails with batch + failhard options

  • ISSUE #33041: (anitakrueger) boto_elb.present security_groups kwarg is a list - needs documentation (refs: #33053)

    • PR #33053: (rallytime) Allow security_groups kwarg for boto_elb.present to be string or list

    • PR #33054: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8

    • PR #33056: (justinta) File and User test fixes for 2015.8 on Fedora23

  • ISSUE #32472: (esn89) salt-minion is stuck in a restart loop with not much info: (refs: #33030)

  • ISSUE #32834: (beardedeagle) Masterless Minion - Unable to query job cache (refs: #33017, #33100)

  • ISSUE #11801: (slai) Salt does not match user names properly under Windows (refs: #32674)

  • ISSUE #32856: (DeanScothern) jjid not shown when running the salt command line with --batch-size using either --verbose or --show-jid with certain salt versions (refs: #32996)

  • ISSUE #31738: (igorwidlinski) salt --show-jid does not show job id when run in batch mode (refs: #32450)

  • ISSUE #32954: (atengler) glusterfs.peered fails with 'NoneType' object is not iterable (refs: #32955)

  • ISSUE #26011: (rodriguezsergio) states.virtualenv != modules.virtualenv (refs: #32994)

  • ISSUE #32777: (sjorge) cron.present broken on Solarish systems if user specified (refs: #32970)

    • PR #32970: (sjorge) fix user cron on solarish operating systems

    • PR #32796: (jfindlay) salt.log.setup: process user args before format

  • ISSUE #32891: (guettli) docs: Note " This document represents behavior exhibited by Salt requisites as of version 0.9.7 of Salt." (refs: #32934)

    • PR #32934: (jfindlay) doc.ref.states.ordering: clarify requisite change

  • ISSUE #32882: (papertigers) carbon_return is missing a default value. (refs: #32883)

  • ISSUE #32646: (deamen) FileClient Class ( client = salt.minion.FileClient(__opts__) ) does not exist (refs: #32925)

    • PR #32925: (rallytime) Remove FileClient class references from docs - it doesn't exist.

  • ISSUE #23683: (gravyboat) contents_grains should have an example (refs: #32922)

  • PR #32926: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-04-28 19:47:52 UTC

    • e60c12640d Merge pull request #32926 from rallytime/merge-2015.8

    • 5a184881be Merge branch '2015.5' into '2015.8'

    • edce22a143 backport PR #32732 to 2015.5 fixes #23714 (#32848)

    • PR #32908: (Ch3LL) Specify EBS volume tags in profile configuration in aws

  • ISSUE #23952: (neogenix) iptables state append doesn't honor position -1 (refs: #32906)

    • PR #32906: (rallytime) Update docs to warn users that -1 isn't valid for iptables insert state

  • ISSUE #32510: (Ch3LL) Cannot specify image in provider file when using map file (refs: #32900)

    • PR #32900: (rallytime) Allow profile options to be specified in provider file when using maps

  • ISSUE #30855: (guettli) Docs: does salt.states.service support systemd? (refs: #32880)

    • PR #32880: (rallytime) Clarify service state opening docs - uses 'service' virtualname

  • PR #32884: (terminalmage) Fix incorrect deprecation notice @ 2016-04-27 15:47:35 UTC

    • e1b40b3b76 Merge pull request #32884 from terminalmage/fix-incorrect-deprecation-notice

    • b307c5452a Fix incorrect deprecation notice

  • PR #32878: (jacobhammons) added note about updating the bootstrap script in salt-cloud using th… @ 2016-04-26 21:09:51 UTC

    • a2921b9da0 Merge pull request #32878 from jacobhammons/salt-cloud

    • 3887938727 added note about updating the bootstrap script in salt-cloud using the -u flag, removed the saltconf banner.

  • ISSUE #32861: (bradthurber) Is it master_syndic or syndic_master? (refs: #32869)

  • PR #32869: (rallytime) Use correct config setting in cloud syndic docs @ 2016-04-26 19:13:21 UTC

    • 71db10fd2c Merge pull request #32869 from rallytime/fix-32861

    • 0e73daa126 Use correct config setting in cloud syndic docs

  • PR #32844: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-04-26 17:38:08 UTC

    • 02c681311f Merge pull request #32844 from rallytime/merge-2015.8

    • 1fc9de1d04 Add 'file.source_list' mock to archive state unit tests

    • 9064d3bbfb Merge branch '2015.5' into '2015.8'

      • 9b5c14c37c salt-cloud -u downloads stable version from bootstrap.saltstack.com by default (#32837)

      • 9725804448 update bootstrap to 2016.04.18 release (#32667)

      • c842e1e437 Merge pull request #32776 from rallytime/merge-2015.5

        • 7ecbf9f885 Merge pull request #14 from whiteinge/runner-async-low

          • 211f7b4af1 Format low data correct for runner_async

        • ce72851861 Merge branch '2014.7' into '2015.5'

        • 2775edc176 Saltnado /run fix (#32590)

        • b19c5a5ce7 Verify auth in saltnado run (#32552)

      • 67d0c81184 Support remote sources in a source list (#32691)

      • bd5442d768 Merge pull request #32686 from cachedout/issue_32661

        • f704df90bc Fix stacktrace in batch with dup minion ids

      • 3ec9502a86 Update "Low Hanging Fruit" to "Help Wanted" (#32675)

      • 77bea56b68 Additional documentation on calling exec modules from templates (#32657)

      • c910b8dd51 Fixing critical bug to remove only the specified Host instead of the entire Host cluster (#32639)

      • 4568565d45 Add _syspaths.py to .gitignore (#32638)

  • ISSUE #32799: (belt) ssh_auth.present creates ~/~${USER}/.ssh (refs: #32868)

  • ISSUE #23714: (naemono) file.copy force ignored during highstate, but not with 'salt-call state.sls_id' (refs: #32732, #32847, #32848)

  • ISSUE #32824: (bradthurber) salt-cloud vmware: wrong pyvmomi installed for RHEL/CentOS 6 (refs: #32845)

    • PR #32845: (rallytime) Add pyvmomi version warning to Getting Started with VMware docs

  • ISSUE #25492: (hernanc) "docker-py mem_limit has been moved to host_config in API version 1.19" error (refs: #26518, #32818)

  • ISSUE #32605: (Talkless) pkgrepo.managed with apt does not add comments value later (refs: #32813)

  • ISSUE #32710: (bradthurber) conf/master missing many gitfs and git_pillar parameters (refs: #32722)

  • PR #32787: (rallytime) Back-port #32722 to 2015.8 @ 2016-04-25 15:19:21 UTC

    • PR #32722: (bradthurber) Catch up the conf/master file to include gitfs/git_pillar parms from … (refs: #32787)

    • 96a3d4e556 Merge pull request #32787 from rallytime/bp-32722

    • 8d7148d41b Catch up the conf/master file to include gitfs/git_pillar parms from recent releases

  • PR #32786: (rallytime) Back-port #32703 to 2015.8 @ 2016-04-25 15:19:13 UTC

    • PR #32703: (schancel) Make example top file match templated version (refs: #32786)

    • 36f70f5847 Merge pull request #32786 from rallytime/bp-32703

    • baa4df25c9 Make example top file match templated version

    • 227ef4aabb Fix unnecessary capitalization

    • 73cd9f26c3 Merge branch 'gitfs_perremote_doc_updates' of https://github.com/l2ol33rt/salt into pr-32775

    • b69d406ada Including name per-remote config option in example

    • PR #32779: (terminalmage) Improve documentation on pygit2 versions

  • ISSUE #32609: (anlutro) Tornado ioloop fails when master disconnects? (refs: #32749)

  • ISSUE #32144: (vutny) Pillar targeting starts to work only after calling saltutil.refresh_pillar (refs: #32643)

  • ISSUE #32705: (joakimkarlsson) win_dacl.present: Specifying propagations for a directory fails (refs: #32720)

    • PR #32720: (jfindlay) modules.win_dacl: consistent case of dacl constants

  • ISSUE #30761: (sjmh) Cannot target subsets of minions when using pillar and external_auth (refs: #31598)

  • ISSUE #21303: (Lothiraldan) Explicit and document ACL rules format (refs: #32733)

  • PR #32718: (garethgreenaway) Fixes to schedule.list in 2015.8 @ 2016-04-20 19:51:24 UTC

    • f52af5a596 Merge pull request #32718 from garethgreenaway/2015_8_schedule_list_fix

    • 7fa5d809d2 backporting a fix from develop where the use of splay would result in seconds=0 in the schedule.list when there was no seconds specified in the origina schedule

  • PR #32684: (captaininspiration) Fix routes for redhat < 6 @ 2016-04-19 19:18:20 UTC

  • ISSUE #32523: (junster1) network.py/loader.py failing because cfn variable is not defined before use. (refs: #32672)

  • ISSUE #32517: (Ch3LL) Minion restarting and erroring when cannot reach the masters in multi-master failover (refs: #32555, #32556)

  • ISSUE #31542: (duk3luk3) jinja stringifies dict before passing it to execution module (maybe salt-ssh specific?) (refs: #32588)

  • PR #32588: (anlutro) Fix salt-ssh module function call argument type juggling by JSON encoding them @ 2016-04-18 15:57:14 UTC

    • a6a427463d Merge pull request #32588 from alprs/fix-salt_ssh_module_types

    • d912f1c3c6 json encode arguments passed to an execution module function call

  • ISSUE #32229: (seanjnkns) 2015.8.8.2: pkg.installed fails to update packages with epoch (refs: #32563)

    • PR #32563: (terminalmage) yumpkg: Ignore epoch in version comparison for explicit versions without an epoch

    • PR #32640: (nmadhok) [2015.8] - Fixing critical bug to remove only the specified Host instead of the entire Host cluster

    • PR #32649: (mcalmer) align OS grains from older SLES with current one

    • PR #32652: (isbm) Prevent crash if pygit2 package is requesting re-compilation of the e…

  • PR #32614: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-04-15 19:27:47 UTC

    • 05a41a13cd Merge pull request #32614 from rallytime/merge-2015.8

    • 046e401dd8 Merge branch '2015.5' into '2015.8'

      • 027b502335 Merge pull request #32561 from gtmanfred/user_passwords

        • 3db5e78d5d redact passwords and hashes from user.present updates

  • PR #32616: (rallytime) Back-port #32547 to 2015.8 @ 2016-04-15 19:27:36 UTC

    • PR #32547: (cro) Expand on the open-source vs open-core FAQ (refs: #32616)

    • ef17bde054 Merge pull request #32616 from rallytime/bp-32547

    • 4242bc7399 Language clarification.

    • 965e3bc1d1 Expand on the open-source vs open-core FAQ

    • PR #32604: (Talkless) Fix comments value in salt.states.pkgrepo example

    • PR #32558: (terminalmage) Revert PR #32480 and apply #32314 with fixes / documentation

    • PR #32480: (terminalmage) Clear VCS fsbackend and git_pillar locks on master start (refs: #32558)

    • PR #32314: (onorua) prevent eternal gitfs lock due to process crash (refs: #32480, #32558)

  • ISSUE #32519: (Ch3LL) Minion restarting and erroring when cannot reach the master (refs: #32576)

  • ISSUE #32517: (Ch3LL) Minion restarting and erroring when cannot reach the masters in multi-master failover (refs: #32555, #32556)

  • PR #32536: (rallytime) Back-port #31898 to 2015.8 @ 2016-04-13 18:49:05 UTC

    • PR #31898: (afletch) Ensure rh_service not used on CloudLinux 7 (refs: #32536)

    • 27e91e40cc Merge pull request #32536 from rallytime/bp-31898

    • 60d80c4dee Ensure rh_service not used on CloudLinux 7

    • PR #32542: (twangboy) Fix binary search and replace

  • PR #32539: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-04-13 15:10:08 UTC

    • cce7de76b0 Merge pull request #32539 from rallytime/merge-2015.8

    • fbaeb165c9 Merge branch '2015.5' into merge-2015.8

    • 7307bcb88e Merge pull request #32538 from rallytime/bp-32528

      • 46a4e8a310 Remove merge conflict line

      • e0d947c707 Document "grains" setting in the minion configuration reference

  • ISSUE #32493: (bberberov) dockerng.volume_present fails when no volumes already exist on the system (refs: #32531)

  • PR #32531: (ticosax) [dockerng] Fix support of dockerng.volume_present when no volume is on present. @ 2016-04-13 14:42:13 UTC

    • 1834bdefe3 Merge pull request #32531 from ticosax/support-no-volumes

    • 958b2ec749 Fix support of dockerng.volume_present when no volume is on present.

    • PR #32475: (ticosax) [dockerng] Enhance dockerng.wait() to control success on exit_code and on already stopped containers

    • PR #32436: (isbm) Bugfix: salt-key crashes if tries to generate keys to the directory w/o write access

    • PR #32515: (terminalmage) Turn on exc_info when logging failed minion startup

    • PR #32520: (terminalmage) Add ignore_epoch option to pkg.installed/removed/purged states

    • PR #32505: (isbm) Isbm zypper list products sles11 crash

    • PR #32480: (terminalmage) Clear VCS fsbackend and git_pillar locks on master start (refs: #32558)

    • PR #32314: (onorua) prevent eternal gitfs lock due to process crash (refs: #32480, #32558)

  • ISSUE #32327: (joakimkarlsson) salt-minion fails to start on Windows (refs: #32491)

  • ISSUE #31927: (afletch) pkg.installed compares version including package epoch (pkg.version problem?) (refs: #32487)

  • PR #32487: (terminalmage) Add explanation of nonzero epoch requirement to pkg.installed state documentation @ 2016-04-11 20:48:57 UTC

    • e335e313fe Merge pull request #32487 from terminalmage/epoch-documentation

    • e04cf879b6 Document new behavior of pkg.installed for yum/dnf packages with non-zero epoch

    • 61e9761224 Add explanation of nonzero epoch requirement to pkg.installed state documentation

  • PR #32482: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-04-11 20:12:26 UTC

    • e8de50ff37 Merge pull request #32482 from rallytime/merge-2015.8

    • 1b04f0ddec Merge branch '2015.5' into '2015.8'

    • 29333e533e Add documentation for some master/minion configs (#32454)

    • 100c6e1b25 Merge pull request #32458 from terminalmage/clarify-providers-docs

      • 500d3ebbaa Add link to provider override docs to all group providers

      • 83ca01f620 dd link to provider override docs to all shadow providers

      • c5fe38789d Add link to provider override docs to all user providers

      • 5c1c1dda59 Add link to provider override docs to all service providers

      • 736f2befc9 Add link to provider override docs to all package providers

      • f9306347cc Clarify the scope of the provider param in states.

      • af24c82ab0 Add documentation on virtual module provider overrides to the module docs

      • 0bc6c97a63 Improve docstrings

      • 1948920674 Add external ref to windows package manager docs

      • e7fa21438c Add new doc pages to toctree

      • f0de1236ec Move the tables of virtual modules to individual documentation pages

  • ISSUE #30183: (jakehilton) Minion startup extremely delayed when first master in failover multi master setup is down (refs: #31364, #31382, #32143)

  • ISSUE #29643: (matthayes) Can't get batch mode and --failhard to work as expected (refs: #31164)

  • ISSUE #28569: (andrejohansson) Reactor alert on highstate fail (refs: #31164)

  • ISSUE #31738: (igorwidlinski) salt --show-jid does not show job id when run in batch mode (refs: #32450)

  • PR #32450: (cachedout) Pass parser options into batch mode (refs: #32996) @ 2016-04-08 23:03:49 UTC

    • 7bf44aea72 Merge pull request #32450 from cachedout/issue_31738

    • 74d0fa06b4 Pass parser options into batch mode

  • ISSUE #28706: (kkaig) user.present:groups vs group.present:members (refs: #30824, #32448)

  • ISSUE #31851: (rhansen) error using module.run -> saltutil.runner -> state.orchestrate: "The following arguments are missing: _fun" (refs: #32445)

  • ISSUE #32033: (timcharper) SaltStack modules.dockerng _compare does not handle docker implicit Domainname properly (issue when using network_mode: host) (refs: #32116, #32432)

  • PR #32432: (ticosax) [dockerng] Fix Domainname introspection @ 2016-04-08 16:12:19 UTC

    • a36f9499fc Merge pull request #32432 from ticosax/fix-domainname-introspection

    • 505b5b0168 Fix Domainname introspection

  • PR #32427: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-04-08 15:39:13 UTC

    • def911974c Merge pull request #32427 from rallytime/merge-2015.8

    • 9531ea6ef5 Merge branch '2015.5' into '2015.8'

    • 0809126d8e Merge #32293 with test fixes (#32418)

    • bbd8260a42 Ignore Raspbian in service.py __virtual__ (#32421)

    • 690addf0b4 FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg#1409 for more info.

    • a36866d7db Merge pull request #32399 from amontalban/2015.5

    • 3f03c5fcf9 Merge pull request #32374 from cachedout/issue_32066

      • 62389d1d1a Update proxmox documentation

    • 8578089beb Merge pull request #32339 from Ch3LL/fix_doc_multi-master

      • 2774da288d remove reference to master_alive_check

  • ISSUE #32311: (rkgrunt) glusterfs module incorrectly indexes into name of bricks (refs: #32312)

  • PR #32423: (justinta) Update glusterfs_test to be inline with #32312 @ 2016-04-07 21:53:03 UTC

    • PR #32312: (rkgrunt) Fixed glusterfs module (refs: #32423)

    • 5bc8c326ce Merge pull request #32423 from jtand/glusterfs_test_fix

    • 6f98bd50eb Update glusterfs_test to be inline with #32312

  • ISSUE #31632: (zieba88) salt-cloud map parallel provisioning -P option failed on 2015.8.5 (refs: #32425)

  • PR #32425: (cachedout) Fix salt-cloud parallel provisioning @ 2016-04-07 21:52:06 UTC

    • c07e02bacb Merge pull request #32425 from cachedout/issue_31632

    • 127c0829ee Fix salt-cloud parallel provisioning

  • PR #32323: (mcalmer) fix sorting by latest version when called with an attribute @ 2016-04-07 06:24:35 UTC

    • 2cc054bbc0 Merge pull request #32323 from mcalmer/fix-ensure-installed-latest-with-attributes

    • cb1f30ee10 fix sorting by latest version when called with an attribute

  • ISSUE saltstack/salt#28262: (palica) FreeBSD pkgng provider raising error for minion (refs: #32376)

  • ISSUE #28262: (palica) FreeBSD pkgng provider raising error for minion (refs: #32376, #32399)

  • PR #32376: (amontalban) Fixes saltstack/salt#28262 (refs: #32399) @ 2016-04-06 20:30:10 UTC

  • ISSUE #32375: (truescotw) jinja template copying file but not replacing tags (refs: #32393)

  • PR #32393: (jfindlay) modules.win_timezone: don't list all zones in debug log @ 2016-04-06 18:10:43 UTC

    • ad77d76cad Merge pull request #32393 from jfindlay/win_zone

    • c01c1b9da2 modules.win_timezone: don't list all zones in debug log

  • PR #32372: (rallytime) Back-port #32358 to 2015.8 @ 2016-04-06 16:35:05 UTC

    • PR #32358: (arthurlogilab) outputter virt_list does not exist anymore (refs: #32372)

    • 76ae95863d Merge pull request #32372 from rallytime/bp-32358

    • 95e0fe7744 outputter virt_list does not exist anymore

  • PR #32392: (multani) Fix documentation on boto_asg and boto_elb modules and states @ 2016-04-06 16:34:36 UTC

    • c612baa119 Merge pull request #32392 from multani/2015.8

    • 77c4772752 Fix documentation on boto_asg and boto_elb modules and states

  • ISSUE #32201: (boltronics) salt-minion memory leak waiting on master to accept key (refs: #32373)

  • PR #32373: (cachedout) Resolve memory leak in authentication @ 2016-04-06 15:19:55 UTC

    • b706d3aa4d Merge pull request #32373 from cachedout/issue_32201

    • d9e4a0f372 Resolve memory leak in authentication

  • PR #32126: (cro) Add a couple CLI examples for the highstate outputter. @ 2016-04-05 17:23:29 UTC

    • 097aa7ccfc Merge pull request #32126 from cro/outputter_terse_docs

    • dafe279e60 Lint

    • abc2de0119 More clarification.

    • 85221e515b Expand docs for highstate outputter. Add CLI examples for when 'state_output: filter' is set.

  • PR #32353: (mcalmer) Prevent metadata download when listing installed products @ 2016-04-05 17:02:15 UTC

    • eab3b99be2 Merge pull request #32353 from mcalmer/prevent-refresh-on-list-installed-products

    • e32212ad53 Prevent metadata download when listing installed products

  • ISSUE #32255: (jakosky) Salt-minion 2015.8.8 should display helpful error when regular file /var/log/salt/minion exists but a directory is expected. (refs: #32321)

  • PR #32321: (abednarik) Better message when minion fail to start @ 2016-04-05 16:28:06 UTC

    • 64abec94e7 Merge pull request #32321 from abednarik/minion_start_fail_log

    • 4c72adc03a Better message when minion fail to start

  • ISSUE #30147: (anandnevase) salt.cloud.CloudClient method create() not working for VMware driver (refs: #32344)

  • PR #32345: (nmadhok) [2015.8] Check if profile key exists in vm_ dict @ 2016-04-05 16:16:36 UTC

    • PR #32344: (nmadhok) Check if profile key exists in vm_ dict (refs: #32345)

    • 59aca733ea Merge pull request #32345 from nmadhok/patch-4

    • 42d7a54240 Check if profile key exists in vm_ dict

  • PR #32343: (Ferbla) Fixed win_wua example documentation @ 2016-04-05 16:14:37 UTC

    • bb033c238d Merge pull request #32343 from Ferbla/2015.8

    • e2f0f16564 Fixed win_wua example documentation

  • ISSUE #32354: (elsmorian) Incorrect capitalisation when telling users to change hash_type to SHA256 (refs: #32360)

  • PR #32360: (rallytime) Make sure hash_type is lowercase in master/minion config files @ 2016-04-05 16:10:46 UTC

    • 3219a8d176 Merge pull request #32360 from rallytime/fix-32354

    • 8b47c205df Make sure hash_type is lowercase in master/minion config files

  • PR #32361: (cro) SDB is no longer experimental @ 2016-04-05 16:10:23 UTC

    • fb530256f6 Merge pull request #32361 from cro/remove_sdb_exp_flag

    • 3bbe284d89 Remove 'experimental' warning from SDB docs.

  • PR #32336: (rallytime) Back-port #28639 to 2015.8 @ 2016-04-04 20:53:11 UTC

    • PR #28639: (RuriRyan) Fixed handling of the disabled option for yumpkg (refs: #32336)

    • e1ef4a9d66 Merge pull request #32336 from rallytime/bp-28639

    • 0829143dd1 Fixed handling of the disabled option for yumpkg

  • ISSUE #32305: (Ch3LL) Receiving NoResponse Errors when running commands that take a longer time (refs: #32332)

  • PR #32332: (rallytime) Don't unsubscribe from open events on the CLI too early on long-running commands @ 2016-04-04 20:39:39 UTC

    • PR #32145: (paclat) fixes 29817 (refs: #32332)

    • 6ee5a9729c Merge pull request #32332 from rallytime/fix-32305

    • 8dc1161c8a Don't unsubscribe from open events on the CLI too early on long-running commands

  • PR #32333: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-04-04 20:06:02 UTC

    • 22b296d2fd Merge pull request #32333 from rallytime/merge-2015.8

    • d7b4b8b081 Merge branch '2015.5' into '2015.8'

    • fbdc47cc55 Merge pull request #32284 from rallytime/config-audit

      • 0491513204 Don't be so explicit. Just use string_types.

      • 083c477fd3 Use six.string_types in config default tuples

      • 7e642b8381 Audit config.py default types and values - first sweep

    • 0a6d44e57b Merge pull request #32302 from terminalmage/fix-missing-release

      • 413c371ccd Properly support packages with blank "Release" param in pkg.latest_version

  • ISSUE #32246: (danlsgiga) IMPORTANT: Do not use md5 hashing algorithm! Please set "hash_type" to SHA256 in Salt Minion config! (refs: #32289)

  • PR #32289: (rallytime) New salt-cloud instances should not use old hash_type default. @ 2016-04-04 17:52:09 UTC

    • PR #31162: (isbm) Remove MD5 digest from everywhere and default to SHA256 (refs: #32289)

    • 28cc054244 Merge pull request #32289 from rallytime/fix-32246

    • 66acc00c71 New salt-cloud instances should not use old hash_type default.

  • ISSUE #14277: (Sacro) Chocolatey.version doesn't tell you anything informative. (refs: #32291)

  • PR #32291: (twangboy) Fix bad output for chocolatey.version (fixes #14277) @ 2016-04-04 17:50:54 UTC

    • 5fb90a1040 Merge pull request #32291 from twangboy/fix_14277

    • 53f6a28297 Fix problem with return on installed packages

    • f5bd004ab0 Fix chocolatey.version function

  • ISSUE #32183: (llamallama) Salt Cloud 2015.8.8 not installing salt minions on new nodes (refs: #32295)

  • PR #32295: (rallytime) Test the contents of 'deploy_scripts_search_path' in salt.config.cloud_config @ 2016-04-04 17:38:47 UTC

    • edbab99164 Merge pull request #32295 from rallytime/test-cloud-deploy-dir

    • 4037476f40 Patch call to os.path.isdir so we know both search paths are in tuple

    • 49a4eec051 Test the contents of 'deploy_scripts_search_path' in salt.config.cloud_config

  • ISSUE #23617: (porterjamesj) file.managed with proxy broken in 2015.5 (refs: #32315)

  • PR #32315: (ahus1) fixing file.managed with requests lib @ 2016-04-04 17:20:11 UTC

    • 4389680bc5 Merge pull request #32315 from ahus1/fix_file_managed_http_requests

    • a867d23383 ensure streaming mode (use for example by file.managed) will works for requests backend

  • ISSUE saltstack/salt-bootstrap#782: (ninjada) Bootstrap and Links & Documentation still broken due to fedoraproject redirect to fedorainfracloud.org (refs: #32316)

  • ISSUE saltstack/salt-bootstrap#742: (dennisfoconnor) Non-Development Script Broken on Amazon Linux (refs: #32316)

  • ISSUE saltstack/salt-bootstrap#695: (mtippett) Install Failures With Raspbian Jessie (refs: #32316)

  • PR #32316: (vutny) Update Salt Bootstrap tutorial @ 2016-04-04 17:18:12 UTC

    • 9065201761 Merge pull request #32316 from vutny/update-bootstrap-tutorial

    • b9698f015d Update Salt Bootstrap tutorial

  • PR #32325: (bdrung) Re-add shebang to ssh-id-wrapper shell script @ 2016-04-04 17:08:41 UTC

    • 352f3c01d1 Merge pull request #32325 from bdrung/fix-shebang

    • ffe585f078 Re-add shebang to ssh-id-wrapper shell script

  • PR #32326: (bdrung) Fix typos @ 2016-04-04 16:41:41 UTC

    • f16e332b3a Merge pull request #32326 from bdrung/fix-typos

    • a7db152333 Fix typo of don't

    • d4c037301b Fix typo of mismatch

    • 70dba70ff0 Fix typo of addition

    • 68c60903aa Fix typo of multiple

    • 0f2c779b90 Fix typo of function

    • 0c9e4c8c80 Fix typo of available

    • 920abe2ec7 Fix typo of formatted

    • e56dd4bb23 Fix typo of omitted

    • f99e6f1f13 Fix typo of output

    • d3804094f2 Fix typo of whether

    • 538fb6fae2 Fix typo of performed

    • db7af998ee Fix typo of sanitized

    • d7af01da2b Fix typo of corresponding

    • 301e78b5be Fix typo of values

    • 8cada9573f Fix typos of retrieve

    • b484d6f9c9 Fix typo of directories

  • PR #32300: (twangboy) Add documentation to disable winrepo/winrepo_ng @ 2016-04-01 21:23:09 UTC

    • 664043d7e7 Merge pull request #32300 from twangboy/fix_28767

    • c971a3b054 Add documentation for disabled the winrepos

  • ISSUE #18429: (somenick) Pillars passed from command-line override pillar subtrees instead of merging (refs: #32288)

  • PR #32288: (terminalmage) use dictupdate.merge instead of dict.update to merge CLI pillar overrides @ 2016-04-01 16:30:30 UTC

    • 42a25f6b9d Merge pull request #32288 from terminalmage/issue18429

    • db31732137 use dictupdate.merge instead of dict.update to merge CLI pillar overrides

  • PR #32243: (isbm) Ensure latest pkg.info_installed ensure latest @ 2016-03-31 16:09:59 UTC

    • 3e374e7ec6 Merge pull request #32243 from isbm/isbm-zypper-list-installed-ensure-latest

    • fba3d509ac Fix the documentation

    • 73ad8a2bfc Fix lint

    • f07c7ea792 Add lowpkg tests for version comparison

    • afdf451d87 Remove tests from the zypper_test that belongs to rpm_test

    • 3706a21c29 Fix condition from returning None on 0

    • 0a68ebff16 Remove suse/redhat checks, refactor code.

    • 30c8f7216b Move "string to EVR" function to the utilities

    • fb014a40b0 Sort installed pkgs data by version_cmp

    • b57e439d57 Merge yumpkg's and zypper's version_cmp for a common use

    • ebd13a283c Remove version_cmp from Zypper module and use just lowpkg alias

    • b46d5b526a Remove version_cmp from the yumpkg and use just a lowpkg alias

    • f4d9881e61 Force-sort the RPM output to ensure latest version of the multi-package on top of the list.

  • ISSUE #32261: (arthurlogilab) dockerng : AttributeError: 'module' object has no attribute 'version_info' (refs: #32262, #32268)

  • PR #32268: (ticosax) [dockerng] Improve detection for older versions of docker-py @ 2016-03-31 14:51:46 UTC

    • PR #32262: (arthurlogilab) Catch Attribute Error when docker.version_info doesn't exist (refs: #32268)

    • 88fa3c5f71 Merge pull request #32268 from ticosax/handle-dockerpy-old

    • 05116aaa40 Improve detection for older versions of docker-py

  • PR #32258: (jacobhammons) Replaces incorrect reference to master_alive_check @ 2016-03-31 14:41:09 UTC

    • a491897a3b Merge pull request #32258 from jacobhammons/alive-interval-docs

    • ff8ca5ac2e Replaces incorrect reference to master_alive_check with master_alive_interval in docs

  • PR #32254: (twangboy) Fix Display Name with spaces in win_servermanager @ 2016-03-31 14:38:22 UTC

    • 8c68d8ac41 Merge pull request #32254 from twangboy/fix_31334

    • e5f02c52be Fix a pylint error

    • 5ca4ad6675 Fix unit tests for state

    • 12d530f8f0 Fix win_servermanager state

    • b26cb76abb Fix unit tests

    • 1d5bcee390 Fix 31344

  • PR #32248: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-03-30 21:10:01 UTC

    • 0f5e67de5d Merge pull request #32248 from rallytime/merge-2015.8

    • d743f8cc4e Merge branch '2015.5' into '2015.8'

      • 5d08db7c92 Merge pull request #32162 from terminalmage/issue31963

        • 5c1bdb812c Fix pkgrepo integration test

        • e7fb3095ce Properly handle yum/zypper repositories in pkgrepo.managed

        • add2111fec Use six.iteritems instead of dict.items

        • 6c21881c38 Docstring tweaks

        • ecbb78b649 Remove useless function

        • 06f3309552 Normalize variable naming to match other functions

        • 690537ca8b Look for apt-add-repository in PATH instead of assuming it's there

        • 709d80bb1b aptpkg: Accept **kwargs instead of a dict for pkg.expand_repo_def

      • 4fcdaab428 Merge pull request #32223 from twangboy/fix_31976

        • b7fcae97ce Create minion.d directory, fixes #31976

      • 3309ff6a29 Merge pull request #32218 from cachedout/issue_31501

        • 6795d6aef0 Only display error when tty is True in salt-ssh

      • 6e0cb22c96 Merge pull request #32196 from jtand/cherrypy_pam_test_lint_fix

        • bd3942e0fd Fixed pylint error in app_pam_test.py

  • ISSUE #32169: (sknutsonsf) CommandNotFoundError: update-rc.d during service.enabled on Centos 7 (refs: #32230)

  • PR #32230: (terminalmage) systemd.py: Support both update-rc.d and chkconfig as managers of sysv services @ 2016-03-30 21:09:43 UTC

    • 6216c37885 Merge pull request #32230 from terminalmage/issue32169

    • 45af3e902a systemd.py: Support both update-rc.d and chkconfig as managers of sysv services

  • PR #32249: (jacobhammons) Fixes windows download paths to account for patch @ 2016-03-30 20:26:53 UTC

    • bde2a1fc98 Merge pull request #32249 from jacobhammons/dot8

    • 50d1df2482 Fixes windows download paths to account for patch

  • PR #32221: (dmurphy18) Fix version check, fix extracting Major and Minor versions from __ver… @ 2016-03-30 14:50:31 UTC

    • 1d9321d043 Merge pull request #32221 from dmurphy18/fix_version_check

    • 96cf024e63 Fix version check, fix extracting Major and Minor versions from __version__

  • ISSUE #32031: (travispaul) Unable to manage Windows services that contain a space in the service name (refs: #32227)

  • PR #32227: (twangboy) Remove list2cmdline usage from win_service.py @ 2016-03-30 14:43:17 UTC

    • 22bd1e6b29 Merge pull request #32227 from twangboy/fix_32031

    • 58772b036d Remove list2cmdline usage

  • PR #32239: (anlutro) Add state file name to warning log line @ 2016-03-30 14:37:54 UTC

    • 7fce438b67 Merge pull request #32239 from alprs/fix-file_log_warning

    • 72adae3702 add state file name to log line

  • ISSUE #31365: (cwicklein) osrelease_info broken for CentOS 7 (refs: #32215)

  • PR #32215: (DmitryKuzmenko) rhel oscodename @ 2016-03-29 19:14:50 UTC

    • 3c3028f347 Merge pull request #32215 from DSRCompany/issues/rhel_oscodename

    • dc2a3b81ac Ignore lsb codename from os-release for newest RHEL

  • PR #32217: (jacobhammons) 2015.8.8.2 release notes @ 2016-03-29 17:53:22 UTC

    • bf59f06733 Merge pull request #32217 from jacobhammons/dot8

    • 596444e2b4 2015.8.8.2 release notes Adds banner notifying user when they are viewing release notes for an old release

  • ISSUE #31844: (Talkless) slspath is not documented (refs: #32197)

  • PR #32212: (rallytime) Back-port #32197 to 2015.8 @ 2016-03-29 15:50:58 UTC

    • PR #32197: (twellspring) documentation fix issue 31844 (refs: #32212)

    • ab8b70d985 Merge pull request #32212 from rallytime/bp-32197

    • 5fdd81ace9 documentation fix issue 31844

  • ISSUE #31931: (gravyboat) Ordering States documentation should note top.sls adheres to this rule (refs: #32193)

  • PR #32211: (rallytime) Back-port #32210 to 2015.8 @ 2016-03-29 15:50:42 UTC

    • PR #32210: (rallytime) Merge #32193 with pylint fix (refs: #32211)

    • PR #32193: (twellspring) Documentation fix 31931 (refs: #32210, #32211)

    • 200d82cc3e Merge pull request #32211 from rallytime/bp-32210

    • 7b9c05487c Whitespace fix.

    • abd432746c documentation-fix-31931

    • 79086f8f04 service.py documentation update for 32084

  • ISSUE #32084: (guettli) Docs: Please provide a link from "service.running" to "watch" (refs: #32192)

  • PR #32209: (rallytime) Back-port #32208 to 2015.8 @ 2016-03-29 15:50:27 UTC

  • ISSUE #31595: (dverbeek84) dockerng ports specified in Dockerfile must be in sls file otherwise salt gives an error (refs: #32204)

  • PR #32204: (ticosax) [dockerng] Consider labels carried by the image when comparing user defined labels. @ 2016-03-29 14:39:22 UTC

    • 7154104591 Merge pull request #32204 from ticosax/label-from-image

    • c989ae5a7e Merge user defined labels with one carried by the image

  • PR #32186: (rallytime) Add some "best practices" information to test documentation @ 2016-03-29 00:22:48 UTC

    • 5877a19f59 Merge pull request #32186 from rallytime/testing-docs

    • 40d09c822e Add some "best practices" information to test documentation

  • PR #32176: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-03-28 23:16:09 UTC

    • b44adffc12 Merge pull request #32176 from rallytime/merge-2015.8

    • e8658697a6 Pylint fix for integration import

    • 527bc3e491 Pylint fix

    • e9abd2d420 Merge branch '2015.5' into '2015.8'

    • 6b8b8b51c0 Merge pull request #32154 from Ch3LL/ch3ll_pam_2015.5

      • ba605b0128 fix more pylint and add ability to close cherrypy engine

      • 2d4dc4da05 add teardown call

      • d115878714 fix pylint error

      • 4c1ab082b6 add pam salt-api tests

    • 230443be6c Merge pull request #32170 from gtmanfred/lxc_cloud_name

      • eb7d82e7be add name for lxc for use with cloud cache

    • 32b0421a34 Merge pull request #32164 from terminalmage/issue31731-2015.5

      • 18439c4f89 Make __virtual__ for rhservice.py more robust (2015.5 branch)

    • 6212e9aa56 Merge pull request #32141 from paclat/issue_32108

      • 72c5d12d43 fixes 32108

  • ISSUE #27605: (jmcook1) nacl module documentation/possible bug (refs: #32163)

  • PR #32163: (rallytime) Update nacl.config docs to use key value instead of 'None' @ 2016-03-28 14:46:40 UTC

    • 1afb048801 Merge pull request #32163 from rallytime/fix-27605

    • e2d09f57dc Update nacl.config docs to use key value instead of 'None'

  • PR #32166: (vutny) salt.states.file: correct examples with multiline YAML string @ 2016-03-28 14:45:32 UTC

    • c08ba3f8a9 Merge pull request #32166 from vutny/fix-multiline-yaml-string-example

    • 34aaea93b4 Another indentation fix in salt.states.alternatives

    • 85d0576583 salt.states.file: correct examples with multiline YAML string

  • PR #32168: (rallytime) Lint 2015.8 @ 2016-03-27 18:26:50 UTC

    • f2e986cf65 Merge pull request #32168 from rallytime/lint-2015.8

    • ba6b19d72c Lint 2015.8

  • ISSUE #31731: (sjorge) rh_service references osrelease before it is available, also does not return bool (refs: #32165)

  • PR #32165: (terminalmage) Make __virtual__ for rhservice.py more robust (refs: #32164) @ 2016-03-27 18:21:16 UTC

    • PR #32164: (terminalmage) Make __virtual__ for rhservice.py more robust (2015.5 branch) (refs: #32165)

    • ae472617af Merge pull request #32165 from terminalmage/issue31731

    • 559eb7da52 Make __virtual__ for rhservice.py more robust

  • ISSUE #31944: (Inveracity) traceback in _determine_beacon_config(...) in beacon/__init__.py line 105 (refs: #32160)

  • PR #32160: (cachedout) Fix beacon tutorial docs @ 2016-03-25 22:32:51 UTC

    • 63c8bf3542 Merge pull request #32160 from cachedout/issue_31944

    • 104ada5b6f Fix beacon tutorial docs

  • PR #32145: (paclat) fixes 29817 (refs: #32332) @ 2016-03-25 16:55:47 UTC

    • bff94a5160 Merge pull request #32145 from paclat/issue_29817

    • 5d970ca031 fixes 29817

  • PR #32133: (basepi) Pass eauth user/groups through salt-api to destination functions @ 2016-03-25 16:49:46 UTC

    • 245249d347 Merge pull request #32133 from basepi/api_user_passthrough

    • 41ba309839 Change the kwarg names to be more specific

    • 40f7e596d8 Pass eauth user/groups through salt-api to destination functions

  • PR #32127: (rallytime) Add runners to __salt__ docs @ 2016-03-25 15:54:02 UTC

    • a09aa18036 Merge pull request #32127 from rallytime/dunder-docs

    • 482690ef33 Add note to docs about __salt__ referencing runner modules

    • a11d2e413a Add runners to __salt__ docs

  • ISSUE #30183: (jakehilton) Minion startup extremely delayed when first master in failover multi master setup is down (refs: #31364, #31382, #32143)

  • PR #32143: (DmitryKuzmenko) Set auth retry count to 0 if multimaster mode is failover. @ 2016-03-25 15:23:09 UTC

    • PR #31382: (DmitryKuzmenko) Set auth retry count to 0 if multimaster mode is failover (refs: #32143)

    • cc224b877a Merge pull request #32143 from DSRCompany/issues/30183_failover_fix

    • 93d34a2573 Set auth retry count to 0 if multimaster mode is failover.

  • PR #32134: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-03-25 15:22:08 UTC

    • 0679a61871 Merge pull request #32134 from rallytime/merge-2015.8

    • 6886681410 Fix test failures

    • 7554d0f42d Merge branch '2015.5' into '2015.8'

      • bdd7ea89d5 Merge pull request #32129 from terminalmage/issue32044

        • 34ca1ea12e Change type check errors to debug loglevel

        • 5462081488 Support multiple valid option types when performing type checks

      • c42014eb54 Merge pull request #32056 from bstevenson/fix-list_absent

        • 1500aae027 set deleted value to list

        • 1dc8f5f289 unit test update

        • 39adf86fec Fixed negation logic

        • be9388173b Removed has_key in lieu of in

        • e48593ed81 Comments and Changes output fixes

        • b98f5517de Updated to conform to proper ret values

        • d18b4be80b remove whitespace end of line 186:q

        • d2b89c85ad fix formatting

        • 103cee9e29 cleaned up formatting

        • 7a4d7f0bff added whitespace

        • 8ea5b545b0 Loop through list values in list_absent

      • 848ce5647f Merge pull request #32096 from rallytime/bp-32065

        • 36a9d6a374 Fix an issue with the minion targeting example

      • 9b332d48b9 Merge pull request #32104 from jacobhammons/dot10

        • b9fc882a1e One additional known issue for 2015.5.10 release notes

      • ff51d548e1 Merge pull request #32100 from jacobhammons/dot10

        • 544a1661ce 2015.5.10 release docs

      • 72a20f9799 Merge pull request #32038 from terminalmage/issue32037

        • 8b2d983324 Add reference to state tutorial to state.apply docstring

        • 9b4fe8443e Move highstate usage details to top of state.apply docstring

        • 74ee8c54bc Clarify prior role of state.highstate in states tutorial

        • 1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply

  • ISSUE #26129: (GreatSnoopy) salt yumpkg implementation painfully slow in some circumstances (refs: #32091)

  • PR #32091: (clarkperkins) Fixed the regression in 410da78 @ 2016-03-25 14:53:08 UTC

    • ad924226ca Merge pull request #32091 from clarkperkins/bugfix/yumpkg-repoquery

    • d2119ea608 Added comment so this issue doesn't regress again

    • 1455fab9e3 Fixed the regression in 410da78

  • ISSUE #32044: (ScoreUnder) Multiple masters throwing warnings? "Key master with value [...] has an invalid type of list, a str is required for this value" (refs: #32129)

  • PR #32135: (rallytime) [2015.8] Support multiple valid option types when performing type checks @ 2016-03-24 22:42:28 UTC

    • PR #32129: (terminalmage) Support multiple valid option types when performing type checks (refs: #32135, #32284)

    • b84908d51f Merge pull request #32135 from rallytime/32129-to-2915.8

    • 7d43bdd721 Change type check errors to debug loglevel

    • ed5abf4381 Support multiple valid option types when performing type checks

  • PR #31760: (sakateka) SMinion need wait future from eval_master @ 2016-03-24 22:08:56 UTC

    • b23a08f3f4 Merge pull request #31760 from sakateka/fix_master_switch

    • 3d7874029a Run self.eval_master in self.io_loop.run_sync

    • 3b4425652b SMinion need wait future from eval_master

  • PR #32106: (jfindlay) update suse master service patch @ 2016-03-24 21:34:01 UTC

    • 5efe37ddc8 Merge pull request #32106 from jfindlay/suse_patch

    • 8de84b4251 update suse master service patch

  • PR #32130: (jacobhammons) Added known issues 32004 and 32044 to 2015.8.8 release notes @ 2016-03-24 19:59:41 UTC

    • 939c1b17d5 Merge pull request #32130 from jacobhammons/dot8

    • 21eee08842 Added known issues 32004 and 32044 to 2015.8.8 release notes

  • PR #32105: (clarkperkins) Fixed invalid deploy_scripts_search_path @ 2016-03-24 17:36:27 UTC

    • 2d8abf4717 Merge pull request #32105 from clarkperkins/bugfix/invalid-deploy-script-path

    • 5a9f4e947e Fixed invalid deploy_scripts_search_path

  • ISSUE #32114: (tomlaredo) Wrong validation type for file_ignore_glob key (refs: #32117)

  • PR #32117: (tomlaredo) Fixed validation type for file_ignore_glob @ 2016-03-24 17:28:22 UTC

    • fe4112d7f9 Merge pull request #32117 from rodacom/fix_32114

    • c6f83ba00b Fixed validation type for file_ignore_glob Fixes #32114

  • PR #32113: (sakateka) Fix log message for AsyncAuth initialization @ 2016-03-24 17:27:04 UTC

    • 93d86d249c Merge pull request #32113 from sakateka/correct_log_message

    • 71148d77ab Fix log message for AsyncAuth initialization

  • ISSUE #32033: (timcharper) SaltStack modules.dockerng _compare does not handle docker implicit Domainname properly (issue when using network_mode: host) (refs: #32116, #32432)

  • PR #32116: (ticosax) Obtain default value of memory_swap from the container. @ 2016-03-24 15:56:54 UTC

    • 294177f428 Merge pull request #32116 from ticosax/memory_swap-default-from-container

    • fe439db4d3 Obtain default value of memory_swap from the container.

  • PR #32098: (rallytime) Back-port #32083 to 2015.8 @ 2016-03-23 21:49:01 UTC

    • PR #32083: (guettli) "Fire Event Notifications" moved down (refs: #32098)

    • d5bb8f6372 Merge pull request #32098 from rallytime/bp-32083

    • 4a3a6629ce "Fire Event Notifications" moved down

  • PR #32099: (jacobhammons) 2015.8.8 release docs @ 2016-03-23 20:02:40 UTC

    • e45107ce96 Merge pull request #32099 from jacobhammons/dot8

    • 8ec5d989ad 2015.8.8 release docs

  • PR #32088: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-03-23 17:52:37 UTC

    • 9e11f3aac5 Merge pull request #32088 from rallytime/merge-2015.8

    • 59c3b7e82e Merge branch '2015.5' into '2015.8'

    • 908a7bf5cd Merge pull request #32051 from terminalmage/fix-state-apply-output

      • 7d7cb45565 Fix outputter for state.apply

    • 0e66f678d4 Merge pull request #32002 from abednarik/pkg_manjaron_issue31788

      • 1b052d0a66 Added Manajro Linux to virtual. List extended with ManajaroLinux in order su load pacman module.

    • ba5bf62c1a Merge pull request #31957 from rallytime/merge-2015.5

      • 1b6ec5d445 Merge branch '2014.7' into '2015.5'

        • ba73deee46 Merge pull request #31929 from twangboy/fix_build_script

        • 2c5599d2bc Backport build script from 2015.8

        • ce74991dd0 Fix nsi script to work with new build process

    • a52e3ad7a1 Merge pull request #31972 from terminalmage/zh-584

      • 1e5639e495 Make lack of python-ldap module more explicit when LDAP eauth is enabled

  • PR #32074: (Xiami2012) Fix code for proto args in modules.iptables @ 2016-03-23 16:37:58 UTC

    • bc9a899bc8 Merge pull request #32074 from Xiami2012/fix_iptables

    • aae3af7e49 Fix code for proto args in modules.iptables

  • PR #32053: (basepi) [2015.8] Fix rabbitmq_user.present tag handling @ 2016-03-22 20:33:51 UTC

    • 3e08dd0a93 Merge pull request #32053 from basepi/fix_rabbitmq

    • 95c08f55e9 Tear out useless unit test

    • bed048e1e7 Remove leftover arg (lint)

    • 08868cb32a Fix tag handling code for rabbitmq_user.present

    • 3b6d25b4e9 Remove leading whitespace on tags

  • ISSUE #32004: (sjorge) win_dacl module stacktrace: NameError: name 'ntsecuritycon' is not defined (refs: #32023)

  • PR #32023: (sbreidba) Move constant declaration into member variable to avoid issues when m… @ 2016-03-21 20:18:23 UTC

    • 553ecaca25 Merge pull request #32023 from sbreidba/bugfix_32004

    • 711a0a9844 Move constant declaration into member variable to avoid issues when modules can't be loaded.

  • PR #32026: (techhat) Don't require the decode_out file to already exist @ 2016-03-21 20:17:05 UTC

    • 65c634d197 Merge pull request #32026 from techhat/decodeout

    • f27da41b71 Don't require the decode_out file to already exist

  • PR #32019: (rallytime) Back-port #32012 to 2015.8 @ 2016-03-21 15:54:31 UTC

    • PR #32012: (jfray) There were two identical blocks concerning Windows Deploy Timeouts. This (refs: #32019)

    • 1d4246bfd7 Merge pull request #32019 from rallytime/bp-32012

    • 26eee1505f There were two identical blocks concerning Windows Deploy Timeouts. This pull request removes the extra block of text.

  • ISSUE #32013: (timcharper) SaltStack dockerng.running state ports configuration responding to Docker's injection of UDP params (refs: #32015)

  • PR #32015: (ticosax) [dockerng] Fix ports exposition when protocol is passed. @ 2016-03-21 15:22:19 UTC

    • d117db3efb Merge pull request #32015 from ticosax/fix-port-comparison-udp

    • e511864a55 Fix ports exposition when protocol is passed.

  • PR #31999: (jacobhammons) Fixes a doc build exception caused by missing mocks for modules.win_dacl @ 2016-03-19 15:49:40 UTC

    • c72ab6a073 Merge pull request #31999 from jacobhammons/mock-modules2

    • 31bb573abc Fixes a doc build exception caused by missing mocks for modules.win_dacl

  • PR #31992: (notpeter) salt-cloud: add D2 and G2 EC2 instance types @ 2016-03-18 21:37:21 UTC

    • 398ab909f0 Merge pull request #31992 from notpeter/2015.8

    • e3854c8569 D2 and G2 EC2 instance types.

  • PR #31981: (lloydoliver) include rotational disks in grains under linux @ 2016-03-18 15:54:00 UTC

    • ad8ada7eef Merge pull request #31981 from lloydoliver/linux-disk-grain-fix

    • 9c44604438 include rotational disks in grains under linux

  • PR #31970: (twangboy) Add apply_template_on_contents for windows @ 2016-03-18 15:37:29 UTC

    • 9be508e8f0 Merge pull request #31970 from twangboy/fix_win_file

    • dfeae191c1 Add apply_template_on_contents for windows

  • PR #31960: (aletourneau) fixed ec2 get_console_output @ 2016-03-18 15:13:48 UTC

    • 810c6dbcbe Merge pull request #31960 from aletourneau/2015.8_ec2-getconsoleoutput

    • 8305978879 fixed ec2 get_console_output

  • PR #31958: (rallytime) [2015.8] Merge forward from 2015.5 to 2015.8 @ 2016-03-18 15:12:44 UTC

    • 1c7dc364ad Merge pull request #31958 from rallytime/merge-2015.8

  • PR #31935: (twangboy) Back port nullsoft build script from 2015.8 @ 2016-03-17 14:54:50 UTC

    • 2d1f2a0c2e Merge pull request #31935 from twangboy/fix_build_script2

    • 4af8c9dbfc Back port nullsoft build script from 2015.8

  • PR #31912: (jfindlay) log.mixins: remove extemporaneous .record @ 2016-03-16 01:56:46 UTC

    • 43240dc566 Merge pull request #31912 from jfindlay/log_mixin

    • 9f9c694654 log.mixins: remove extemporaneous .record