Salt 2016.3.1 Release Notes¶
Version 2016.3.1 is a bugfix release for 2016.3.0.
Statistics¶
Total Merges: 87
Total Issue References: 23
Total PR References: 58
Contributors: 25 (abednarik, amontalban, anlutro, babilen, cachedout, clburlison, danslimmon, eliasp, glomium, jacobhammons, jfindlay, kev009, lomeroe, michalsuba, neil-williamson, onorua, opdude, rallytime, sjorge, terminalmage, thatch45, ticosax, tomlaredo, twangboy, zigarn)
Final Release of Debian 7 Packages¶
Regular security support for Debian 7 ended on April 25th, 2016. As a result, 2016.3.1 and 2015.8.10 will be the last Salt releases for which Debian 7 packages are created.
Changelog for v2016.3.0..v2016.3.1¶
Generated at: 2018-05-27 04:31:54 UTC
PR #33866: (rallytime) [2016.3] Merge forward from 2015.8 to 2016.3 @ 2016-06-08 19:49:56 UTC
be20ce1bbf Merge pull request #33866 from rallytime/merge-2016.3
595d4f2ac3 Fixup new groupadd tests for syntax change in 2016.3
c5b4ec0b0f Merge branch '2015.8' into '2016.3'
ec09095c45 Merge pull request #33827 from cachedout/issue_33810
9d36f1e474 Fix broken locate.locate function
f7b3d0eda0 Merge pull request #33839 from cachedout/fix_pkgresource_test_stacktrace
435547a747 Fix another unit test stacktrace in pkg_resource
5f081ef31c Merge pull request #33840 from cachedout/remove_matcher_unit_tests
6297448377 Remove matcher tests
cda032dab2 Merge pull request #33836 from cachedout/fix_winserver_manager_test
453fb1ac91 Fixing more stupid unit tests
1db559afe9 Merge pull request #33805 from jfindlay/pkg_tests
0c069ddc95 states.pkg int tests: skip if pkg mgr unavailable
3984b65486 Merge pull request #33808 from jfindlay/gem_tests
f7c19a1a58 modules.gem int tests: relax version checks
6af47d2ba7 modules.gem int tests: remove pkgs before testing install
c30d8a8c61 Merge pull request #33770 from jfindlay/service_tests
f13f914755 states.service: add integration tests
90aee79c39 states.service.mod_watch: update unit test
d210a92f09 states.service.mod_watch: update sfun and force docs
7fdfbe9a28 Merge pull request #33691 from jtand/gem_integration_test
ff2dae103d ubuntu doesn't install default gems when ruby is installed
504df9a65a Fixed lint error
0cb1bfa0d3 Removed extra :
86f59b3e80 Made more pythonic
2f36f34981 Fixed salt.util import. Added status check to make sure external resource is available
400a71ec33 Removed redundancies
91db411bea A couple lint fixes
c97f3319b9 Add check for gem binary
210aceb402 Refactored tests to not use return messages
9d437bd45d Removed artifact from testing
134e1fa888 Fixed typos, and added destructiveTest decorator
37bc3ad8fd Fixed typo, uninstalled to uninstall
5b23b91ac6 Integration test for gem module
bb4194bb79 Merge pull request #33777 from sodium-chloride/2015.8-2016-0604-1939
c1fd830a1a Fix minor docstring issue of arg being missing
c749aea409 Merge pull request #33759 from cachedout/issue_31219
15a39f8646 Catch no minions exception in batch mode
47d668e071 Merge pull request #33719 from cachedout/fixup_33653
635efa248b Change to just surround the mkdir
21b7123a60 Catch oserror for race condition
11e39e7203 Merge pull request #33712 from meaksh/fix-for-groupadd-module-failures-in-SLE11-2015.8
ab738416ba pylint fix
bf27e5d36e test_members cleanup
ba815dbf76 improvements on groupadd unit tests
3bbc5ae0d9 one line is better
a53dc192c9 fix groupadd module for sles11 systems
2c450a7494 Merge pull request #33718 from rallytime/bp-33700
a6a446121a Fix speed issue
a41146730a Fix incorrect args passed to timezone.set_hwclock
b07701f0a0 Merge pull request #33727 from terminalmage/issue33725
d8ba7ed5a5 Fix git_pillar edge case for remote repos without a master branch
015e50cec8 Merge pull request #33728 from jfindlay/test_state_test
87e018af2a states.test.configurable_test_state: add unit tests
c2d0679c4b states.test.configurable_test_state: refactor change_data
f06ff1af1f states.test.configurable_test_state test mode
1cf8fe3f1d Merge pull request #33729 from twangboy/fix_win_servermanager
2de91d166f Fix docstring
9870479d99 Add exclude option to state
50bd76e206 Add exclude option
6c150d840d Merge pull request #33743 from vutny/drop-debian-community-repo-doc
8621f5be54 Debian installation docs: drop section about community-maintained repository
56c0a42e12 Create missing jid dir if it doesn't exist (#33653)
8a566ff4b9 Merge pull request #33654 from twangboy/fix_win_servermanager
6c7b21676a Fix lint and tests
4775e6bdf0 Add additional params to state
b0af32346d Add additional params to install and remove
996ff56dd4 Merge pull request #33679 from terminalmage/issue33424
9da40c4437 Append empty dictionaries for saltenvs with no top file
5eb1b3ca62 Only compile the template contents if they evaluate to True
ISSUE #33843: (richardscollin) 2016.3 Test Suite TCP Error (refs: #33860)
PR #33860: (cachedout) Allow socket closes when the socket is disconnected @ 2016-06-08 18:26:16 UTC
669aa92d59 Merge pull request #33860 from cachedout/issue_33843
2c88e22c07 Use errno
e7de99dd0e Correct silly mistake
7a46360a13 Allow socket closes when the socket is disconnected
ISSUE #33818: (saltuser) 2016.3.0 minion default log level INFO (refs: #33821, #33861)
PR #33698: (opdude) Vsphere fixes @ 2016-06-08 14:12:17 UTC
a3202f1ad6 Merge pull request #33698 from Unity-Technologies/vsphere-fixes
8ff5906fad Revert "Fix a bug when creating a new VM and changing the network info"
636f4c00f0 Make sure we only use GetConnection if we are using a proxy salt minion
64e9334d56 Fix a bug with self signed certificates and creating a new VM
7834aeda7d Fix a bug when creating a new VM and changing the network info
PR #33771: (twangboy) Additional functionality to win_dism.py @ 2016-06-08 13:58:20 UTC
01aaf3e2a9 Merge pull request #33771 from twangboy/win_dism
9be45fe37a Fix some more lint
421dc97957 Fix/add unit tests for state
8d66fac74c Add missing unit tests
60f856f73d Fix unit tests for module
b574947afe Fix some lint errors
a32774c07d Add salt.utils.compare_lists
7ff7050705 Fix incorrect parameters in the state
b8ee89f18e Fix typos
10458d8a70 Remove multiple lookups, faster
d9b848c0d9 Change to dict instead of error
6510e0a5b0 Add restart option
da8562dbc8 Add quiet and norestart options
946371bf1f Handle errors, ensure add/remove
7e6382a8b2 Use list instead of string for cmd
fbdd28f144 Add state functions
90a4ee3d96 Merge branch '2016.3' of https://github.com/saltstack/salt into win_dism
00c24abe1f Add get functions
c6621053fd Add additional functions
36507845b6 Update documentation
ISSUE #33649: (tyhunt99) 2016.3.0 dockerng state fails comparing cmd configuration (refs: #33851)
PR #33851: (ticosax) [dockerng] Add support for edge case when Cmd and Entrypoint can't be blanked @ 2016-06-08 13:52:40 UTC
f546e47552 Merge pull request #33851 from ticosax/fix-entrypoint-support
0d40e1c4f3 Add support for edge case when Cmd and Entrypoint can't be blanked
ISSUE #33818: (saltuser) 2016.3.0 minion default log level INFO (refs: #33821, #33861)
PR #33821: (cachedout) Restore default log level to warning (refs: #33861) @ 2016-06-07 16:51:46 UTC
3f6d06a060 Merge pull request #33821 from cachedout/issue_33818
52f1f77a38 Restore default log level to warning
ISSUE #33578: (ohauer) 2016.3.0 FreeBSD Failed to load grains defined in grain file disks.disks in function <function disks at 0x80cff9320>, error: (refs: #33604, #33767)
PR #33767: (amontalban) Fix #33604 implementation when 'geom disk list' does not output rotat… @ 2016-06-07 14:41:56 UTC
PR #33806: (cachedout) Work around upstream cherrypy bug @ 2016-06-07 14:39:57 UTC
a84588c788 Merge pull request #33806 from cachedout/cherrypy_1444
1b537d41b6 Work around upstream cherrypy bug
ISSUE #33754: (zerthimon) boto_s3_bucket.present is not idempotent (refs: #33776)
PR #33776: (danslimmon) Fixed ACL user comparison. Resolves #33754. @ 2016-06-06 11:11:15 UTC
ISSUE #33741: (jopohl) pkg.install: ERROR: Zypper command failure: Unknown option '--no-refresh' (refs: #33763)
PR #33763: (abednarik) Insert --no-refresh before install in Zypper. @ 2016-06-06 10:53:27 UTC
a92e155a04 Merge pull request #33763 from abednarik/abednarik_zypper_no_refresh_fix
7c909a1d7f Insert --no-refresh before install in Zypper.
ISSUE #33647: (closepin) Pillars passed from command-line override pillar subtrees instead of merging (refs: #33764)
PR #33764: (terminalmage) Merge instead of update pillar overrides @ 2016-06-06 10:52:22 UTC
306848a2d7 Merge pull request #33764 from terminalmage/issue33647
914003c995 Merge instead of update pillar overrides
PR #33772: (danslimmon) Fixed spelling of "through" @ 2016-06-06 10:50:54 UTC
b37a862b70 Merge pull request #33772 from danslimmon/trough-through
ea3498aedc Fixed spelling of "through"
ISSUE #33614: (knuta) grains.has_key() always returns false in 2016.3.0 (refs: #33651)
PR #33651: (cachedout) Restore grains context to renderers @ 2016-06-03 20:48:44 UTC
a8d9221631 Merge pull request #33651 from cachedout/issue_33614
5518e1dd14 Fix whitespace
7b50e1766e Better fix
4e18ff7000 Restore grains context to renderers
PR #33757: (cachedout) Reminder not to return non-serializable data from states @ 2016-06-03 19:23:54 UTC
daf462e430 Merge pull request #33757 from cachedout/state_set_doc
500d4ccec2 Reminder not to return non-serializable data from states
ISSUE #33605: (morganwillcock) win_pkg: UnicodeEncodeError where DisplayName includes "Español" (refs: #33670)
PR #33670: (rallytime) Handle non-ascii package names in state.format_log @ 2016-06-03 16:16:53 UTC
a5684ed123 Merge pull request #33670 from rallytime/fix-33605
59bd51f4c8 Update test to correct iteration
a580d1c6e0 Add unit test for format_log change
e68097445c Revert "Track down more unicode instances and add a test"
9729aed262 Track down more unicode instances and add a test
ae332d1f88 Handle non-ascii package names in state.format_log
ISSUE #33588: (whytewolf) rabbitmq_user.present error (refs: #33641)
PR #33723: (rallytime) Back-port #33641 to 2016.3 @ 2016-06-03 16:07:53 UTC
ISSUE #32059: (fuzzy-id) dockerng fails with: create_container() got an unexpected keyword argument 'binds' (refs: #33748)
PR #33748: (ticosax) HostConfig has been introduced by docker api version 1.15 @ 2016-06-03 15:28:40 UTC
c2b970789c Merge pull request #33748 from ticosax/adjust-api-version-host-config
134e4a9abf HostConfig has been intoriduced by docker api version 1.15
PR #33745: (eliasp) Typo (privilages → privileges) @ 2016-06-03 15:14:37 UTC
e08c685a6c Merge pull request #33745 from eliasp/2016.3-typo-privilages-privileges
646bc426c6 Typo (privilages → privileges)
ISSUE #33537: (anlutro) apache_module state functions changed names with no deprecation warning or backward compatibility (refs: #33562)
PR #33562: (jfindlay) states.apache_*: readd and deprecate enable and disable @ 2016-06-02 19:51:37 UTC
ISSUE #33632: (rbjorklin) dockerng.volume_present: Dryrun isn't dry (refs: #33659)
PR #33659: (danslimmon) Added test mode to states.dockerng. Resolves #33632. @ 2016-06-02 17:45:49 UTC
PR #33696: (clburlison) Update mac native package for upcoming release @ 2016-06-02 17:44:01 UTC
1d6582b659 Merge pull request #33696 from clburlison/2016.3-pkg-fix
b483d1d8a6 Update mac native package for upcoming release
PR #33710: (rallytime) [2016.3] Merge forward from 2015.8 to 2016.3 @ 2016-06-02 16:19:00 UTC
78966f5f30 Merge pull request #33710 from rallytime/merge-2016.3
b7accb0b3b Merge branch '2015.8' into '2016.3'
c8dc70b96a Merge pull request #33685 from jfindlay/get_url_test
2b5035fdc0 modules.cp.get_url: add test for https://
5e022ff29c Merge pull request #33581 from dincamihai/2015.8
788730ea72 DRY test
1d3769ccfa Improve zypper_patcher_config looks
42d8d4195c Assert only gpgautoimport: True works
ced75e8e62 Reverse if conditions and rename variable
80bfbe5c52 Reduce dicts and lists to one line where possible
1d5d6d7d60 Update test method names to pass pylint
c7ae5907ee Call zypper refresh after adding/modifying a repository
069ee15b7c Merge pull request #33681 from rallytime/bp-33599
45143a599b use requests streaming for uploads/downloads to file (return_bin unchanged) allows downloading files larger than amount of memory (non-stream reads into memory before writing to disk or uploading)
4a9b23f03f first go at having requests use streaming for get/put requests
13537c4891 Merge pull request #33396 from babilen/issue-33393
57e0475cd4 Make pip InstallationError import more robust
291a3e21fa Remove duplicated code.
7bce4ece1a Merge pull request #33652 from terminalmage/zh723
411841603a Lower the log level for failed auths
504989388a Merge pull request #33615 from danslimmon/mysql-traceback-33582
180099ae9f Wrote test for broken server connection
c6c3ff02e3 Added some error checking to resolve #33582.
ISSUE #32916: (giannello) file.managed memory usage with s3 sources (refs: #33599, #33682)
ISSUE #33532: (Routhinator) 2016.3 breaks existing formulas that work on 2015.8 (refs: #33688)
PR #33688: (terminalmage) Undo __repr__() and __str__() parts of d5a7dcc
ISSUE #29265: (mbochenk) mysql_user.present does not work with MySQL 5.7 (refs: #33690, #32440, #30603)
PR #33690: (neil-williamson) Remove explicit PW column default from mysql_user
PR #32440: (neil-williamson) Automatically detect correct MySQL password column for 5.7 and fix setting passwords (refs: #33690)
PR #30603: (michalsuba) addressing #29265 (refs: #32440)
PR #33680: (rallytime) Back-port #32942 to 2016.3 @ 2016-06-01 22:14:20 UTC
PR #33677: (twangboy) Pass kwargs to cmd.run @ 2016-06-01 20:20:08 UTC
9571dad678 Merge pull request #33677 from twangboy/fix_runas
4272afe0d5 Pass kwargs to cmd.run
ISSUE #33529: (djneades) pkg.latest completely broken on FreeBSD in salt-ssh 2016.3 (refs: #33648)
PR #33648: (terminalmage) salt.modules.pkgng: Fix incorrect usage of _pkg() @ 2016-06-01 16:37:46 UTC
d566ec4b31 Merge pull request #33648 from terminalmage/issue33529
4ad80d29b6 salt.modules.pkgng: Fix incorrect usage of _pkg()
PR #33646: (jfindlay) Fix more tmp paths on MacOS @ 2016-06-01 16:36:33 UTC
e92d6e214f Merge pull request #33646 from jfindlay/mac_tests
c53a727c18 tests.runtests: use globally-determined tempdir
8295b48459 test.integration: use hard /tmp on MacOS
PR #33656: (cachedout) Fix indentation error in minion.py @ 2016-06-01 16:23:20 UTC
PR #33637: (rallytime) [2016.3] Merge forward from 2015.8 to 2016.3 @ 2016-05-31 18:43:17 UTC
b379dc57fd Merge pull request #33637 from rallytime/merge-2016.3
cd05d2bed1 Fix zypper test
74a7b78e00 Merge branch '2015.8' into '2016.3'
b47182e47c Merge pull request #33558 from twangboy/fix_win_servermanager
62a6bde0ea Fix comment when already installed
79bc7195dc Fix unit tests
56a6f6bb83 Fix changes
8ebe99ec5e Fix restart_needed
6e478cbda0 Add restart needed
72ebf26616 Add missing import
193583be96 Use dictionary compare for changes in remove
1ae7dd76c1 Use dictionary compare for changes
58d89d66e3 Merge pull request #33555 from cachedout/issue_33544
fe7ee7a470 Fix crashing Maintenence process
d052908729 Merge pull request #33501 from meaksh/zypper-download-check-signature-2015.8
eaaef25c79 lint issue fixed
6b6febb211 unit tests for rpm.checksum() and zypper.download()
e2d0c4abb1 Merge pull request #33513 from rallytime/fix-33319
81c1471209 Add a section to the jinja docs about escaping jinja
fabc15e616 Merge pull request #33520 from jacobhammons/release-notes.8
42e358af7d Updated version numbers in the docs for the 2016.3.0 release
PR #33613: (abednarik) Updated apache_module for backward compatible. (refs: #33638)
ISSUE #33590: (morganwillcock) ini_manage.options_absent: only works in test mode (TypeError: unhashable type: 'list') (refs: #33606)
PR #33606: (danslimmon) Fixed ini.options_absent. Resolves #33590. @ 2016-05-31 15:51:35 UTC
ISSUE #33578: (ohauer) 2016.3.0 FreeBSD Failed to load grains defined in grain file disks.disks in function <function disks at 0x80cff9320>, error: (refs: #33604, #33767)
PR #33604: (kev009) Fix #33578 disks grain (refs: #33767) @ 2016-05-31 15:17:37 UTC
PR #33603: (sjorge) allow esky packages to be build on base64 2015Q4 @ 2016-05-29 00:36:02 UTC
e9a0c9304a Merge pull request #33603 from sjorge/2016.3-smartos-esky
1064102394 add no-wheel, instructions were failing for someone testing due to wheel being used nog producing an egg
c85e03ecf7 allow for newer pyzmq in esky packages
1620b8c0fa allow esky packages to be build on base64 2015Q4
ISSUE #33565: (jamesp9) Typo in states/virtualenv_mod.py (refs: #33576)
PR #33576: (tomlaredo) Fix #33565 (typo causes invalid syntax) @ 2016-05-27 16:46:35 UTC
ISSUE #33530: (kluoto) Centos7 pkg.upgrade failure on 2016.3 (refs: #33549)
PR #33549: (thatch45) Fix for #33530 @ 2016-05-26 19:26:01 UTC
PR #33538: (anlutro) Fix a KeyError if group is provided but not user in cmd states @ 2016-05-26 17:58:05 UTC
4831c6a353 Merge pull request #33538 from alprs/fix-cmd_user_runas_deprecation_bug
c738a0de76 fix a KeyError if group is provided but not user
ISSUE #33543: (arthurlogilab) Thorium documentation is incorrectly formatted and appears partially on docs.saltproject.io (refs: #33550)
PR #33550: (jacobhammons) Fixes display of thorium docs @ 2016-05-26 17:57:05 UTC
PR #33509: (twangboy) Detect System Architecture for Mac Build @ 2016-05-26 14:40:54 UTC
3a95f8a977 Merge pull request #33509 from twangboy/fix_arch
7844059dcf Handle system architecture
PR #33522: (jfindlay) rework modules.mac_brew.latest_version to work around brew version inconsistency @ 2016-05-26 14:19:25 UTC
0bc881b4da Merge pull request #33522 from jfindlay/mac_pkg
2781377b17 modules.mac_brew: update unit tests
0ed3598fc9 modules.mac_brew int tests: add latest_version test
8789c2d06d modules.mac_brew int tests: add list_upgrades,info_installed
be381e0fc9 modules.mac_brew int tests: move decorators to class
fa3ec8a2bf modules.mac_brew.latest_version: refactor to use standard methods
58492c29cf modules.mac_brew: add info_installed function
9abf8f4832 modules.mac_brew.list_upgrades: use brew's json output
77a4f5b01e modules.mac_brew: move retcode check to _call_brew
PR #33519: (jacobhammons) New doc site layout, 2016.3.0 release note known issue additions @ 2016-05-26 13:53:21 UTC
518713f5e5 Merge pull request #33519 from jacobhammons/2016.3.0rel
a424c38f5d New doc site layout, 2016.3.0 release note known issue additions
PR #33508: (rallytime) [2016.3] Merge forward from 2015.8 to 2016.3 @ 2016-05-25 20:34:49 UTC
9199101ef2 Merge pull request #33508 from rallytime/merge-2016.3
a5e0141eda Merge branch '2015.8' into '2106.3'
5a6b037cbd Merge pull request #33507 from rallytime/merge-2015.8
03b0c97520 Merge branch '2015.5' into '2015.8'
6f7fda0354 Merge pull request #33486 from jtand/2015.5
d1e210fff8 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5
ee2ae0ea8a Added docstring examples to glance.image_schema and schema_get
59e90064e6 modules.swift.head does not have a body. Should not be checked for a docstring right now.
f72ec1479b Merge pull request #33482 from rallytime/pillar-opts-docs
087564528d Add pillar_opts docs to master.rst
dc644b145d Merge pull request #33488 from rallytime/fix-18752
b0a9f4181f Add docs for the syndic_finger config
a4e84aa7d2 Merge pull request #33454 from scubahub/2015.5
df3c0b8e78 Correct (and make consistent) determination of the test flag.
3a52ace673 manage account information for pam (#33473)
ee76be3b0b Merge pull request #33503 from rallytime/fix-15252
cfc07f7641 Add docs about minion config file in standalone minion docs
e9b648e461 Merge pull request #33474 from cachedout/issue_29451
aa2bac3a0d Remove debugging
68d8050cb8 Fix diskusage beacon
3bfb6bf719 Merge pull request #33465 from meaksh/check-if-job-returns-successfully-2015.8
9deb70fd8e jobs.exit_success() now works parsing the results of jobs.lookup_id()
7ba40c4f31 jobs.exit_success allow checking if a job has executed and exit successfully
70eb7b66f3 Merge pull request #33487 from jtand/glance_doc_fixes
0b1cae05d9 Added docstring examples to glance methods and nova.list
ebf1256545 Don't need to check swift.head due to it having no body
56ea979916 Merge pull request #33481 from rallytime/fix-33423
7fd3e8f361 Fix docs about etcd config options and add pillar_opts doc
2394cdc4bf Merge pull request #33490 from rallytime/fix-16319
0c5548f9d1 Document the postgres.psql_query function
ede232f0f1 Merge pull request #33480 from jfindlay/service_doc
29c00a1b1b states.service: clarify function description language
6a9ae09e79 states.service.__virtual__: add load fail reason
4f96cc1f54 Return full pending computer name (#33483)
a89be5e9d4 Use six.string_types in jobs runner (#33499)
2e24a04565 Merge pull request #33491 from BlaineAtAffirm/2015.8
7599b18995 fix jobs.list_jobs failing with search_target
1861af427e Merge pull request #33478 from rallytime/bp-32484
042f17efa4 Only unsub if we have a jid
b8154b678e Merge pull request #33457 from rallytime/doc-formatting
82f8f3efff Make doc formatting consistent and use correct versionadded
1dfa95651c Don't allow a "repo" kwarg for pkgrepo.managed (#33477)
b4071b07f1 Allow for config entry to be a list in a dict for beacons (#33476)
9f56ab4c45 Merge pull request #33469 from meaksh/zypper-download-check-signature-2015.8
a65071a6d1 simpler rpm.checksum function
80fe303e38 Renamed check_sig to checksum and some refactoring
d56e3f4258 bugfix: showing errors when a package download fails using zypper pkg.download
8a21b9149e check the signature of downloaded RPM files
00f9090928 Add docs about PyYAML's 1024 character limitations for simple keys (#33459)
3b12f396b4 Prevent several minion processes on the same machine (#33464)
c8b4f338d8 Make --gpg-auto-import-keys a global param when calling zypper (#33432)
0c4e38ced4 Fix the saltutil.wheel function and add integration tests (#33414)
PR #33505: (twangboy) Fix build script where pip didn't work @ 2016-05-25 18:15:27 UTC
a43ffadcb7 Merge pull request #33505 from twangboy/fix_build_script
7d78e5d612 Fix build script where pip wouldn't work
PR #33076: (cachedout) Avoid second grains load on windows multiprocessing (refs: #33656) @ 2016-05-25 17:10:06 UTC
4cf40da7d7 Merge pull request #33076 from cachedout/win_grains
dab9825c88 Fix indentation error
b14e2cce9e Avoid second grains load on windows multiprocessing
