rallytime 2d73fca4d0 Merge branch '2016.11' into 'develop' ... Conflicts: - salt/cloud/clouds/vmware.py - salt/modules/win_dsc.py - salt/modules/win_psget.py - tests/unit/utils/vmware_test/test_cluster.py - tests/unit/utils/vmware_test/test_common.py - tests/unit/utils/vmware_test/test_connection.py - tests/unit/utils/vmware_test/test_datacenter.py - tests/unit/utils/vmware_test/test_host.py		2017-03-31 10:09:56 -06:00
..
integration	Add the @flaky decorator to the reactor integration test	2017-03-30 10:42:26 -06:00
perf	Use print as a function [PEP 3105].	2015-12-04 16:17:35 -08:00
pkg/rpm	Updated salt.spec bash_completion	2016-04-07 09:16:47 -06:00
support	Allow patching sys.modules with mocked modules	2017-03-28 19:04:04 +01:00
unit	Merge branch '2016.11' into 'develop'	2017-03-31 10:09:56 -06:00
utils	Moved some test supporting modules to tests/support	2017-02-28 22:52:48 +00:00
__init__.py
buildpackage.py	[develop] Merge forward from 2016.3 to develop (#33193)	2016-05-12 07:53:39 -07:00
committer_parser.py
conftest.py	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
consist.py
eventlisten.py
eventlisten.sh	Move giant eventlisten.sh example out of the state.event docstring	2015-09-10 13:38:09 -06:00
jenkins.py	Splay sleeps inside jenkins	2015-12-16 14:48:51 -07:00
minionswarm.py	minionswarm.py: allow random UUID	2017-03-10 12:10:21 +01:00
modparser.py
packdump.py
runtests.py	Fix for running just the grains tests	2017-03-22 14:11:22 -05:00
salt-tcpdump.py	No need to call .keys() when iterating a dictionary	2017-03-06 14:42:31 +00:00
saltsh.py
wheeltest.py
whitelist.txt	Add missing import to win_file, remove tests from whitelist	2017-03-29 22:23:05 +00:00