Colton Myers 076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 ... Conflicts: README.rst doc/conf.py doc/ref/index.rst doc/ref/proxy/all/salt.proxy.ssh_sample.rst doc/topics/installation/rhel.rst doc/topics/releases/2015.8.4.rst doc/topics/tutorials/states_pt5.rst salt/cloud/clouds/ec2.py salt/cloud/clouds/opennebula.py salt/config/__init__.py salt/modules/boto_dynamodb.py salt/modules/boto_ec2.py salt/modules/boto_elasticache.py salt/modules/boto_elb.py salt/modules/boto_iam.py salt/modules/boto_rds.py salt/modules/boto_sns.py salt/modules/boto_sqs.py salt/modules/dracr.py salt/modules/git.py salt/modules/mine.py salt/modules/systemd.py salt/modules/win_pkg.py salt/modules/yumpkg.py salt/pillar/__init__.py salt/states/git.py salt/states/rabbitmq_vhost.py salt/states/saltmod.py salt/utils/pkg/rpm.py setup.py tests/unit/modules/systemd_test.py tests/unit/states/rabbitmq_vhost_test.py		2016-02-11 22:33:49 -07:00
..
__init__.py	Include the python encoding file header on tests.	2013-11-27 11:19:24 +00:00
aggregation_test.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
args.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
async_test.py	Keep track of SyncWrapper's IOLoop usage	2015-07-29 08:48:33 -07:00
boto_test.py	Mock config module in utils test	2016-01-11 16:31:21 -07:00
cache_test.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
cloud_test.py	Change cwd back to Salt's code dir	2015-07-28 12:22:53 +01:00
configcomparer_test.py	marathon and chronos proxy minions	2015-11-12 10:03:38 -07:00
context_test.py	Context cache decorator	2015-02-23 19:27:27 -07:00
dictupdate_test.py	Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead	2016-01-19 15:06:30 -07:00
etcd_util_test.py	Add etcd update function	2016-01-25 14:13:33 -08:00
event_test.py	ZeroMQ no longer required when transport is TCP	2015-12-07 20:22:16 -06:00
filebuffer_test.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
find_test.py	Py3 compatibility fixes	2015-01-30 22:25:11 +00:00
format_call_test.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
gitfs_test.py	Add unit tests to ensure a valid provider	2016-02-08 15:18:11 -06:00
http_test.py	Add unit tests for new recursive function	2015-09-29 21:25:47 -06:00
immutabletypes.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
kwarg_regex_test.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
locales_test.py	undo the memoization of contrived locale	2015-06-11 12:13:07 -06:00
network.py	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-20 13:55:14 -06:00
path_join_test.py	Py3 compatibility fixes	2015-01-30 22:25:11 +00:00
process_test.py	Py3 compatibility fixes	2015-01-30 22:25:05 +00:00
rsax931_test.py	no-op	2015-06-15 17:08:43 -06:00
runtime_whitespace_regex_test.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
safe_walk_test.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
schedule_test.py	Two more fixes to unit tests reflecting changes.	2015-08-13 10:53:37 -07:00
schema_test.py	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-08-17 17:06:59 -06:00
url_test.py	Add http basic auth tests	2015-08-29 21:14:20 -05:00
utils_test.py	Revert "Deprecated code removed. "	2016-02-10 11:40:48 -07:00
validate_net_test.py	improve test tests/unit/utils/validate_net_test.py useability	2015-02-09 11:52:08 +01:00
verify_test.py	Py3 compatibility fixes	2015-01-30 22:25:10 +00:00
vt_test.py	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-11 13:15:38 -06:00
warnings_test.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
which_test.py	Fix which test in PR#28812	2015-11-17 11:29:41 +03:00