Colton Myers efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/topics/cloud/vmware.rst salt/cloud/clouds/vmware.py salt/grains/chronos.py salt/grains/marathon.py salt/loader.py salt/modules/chronos.py salt/modules/marathon.py salt/proxy/chronos.py salt/proxy/marathon.py salt/state.py salt/states/chronos_job.py salt/states/marathon_app.py salt/states/user.py salt/utils/schedule.py		2015-11-13 15:18:45 -07:00
..
beacons	lint	2015-05-27 13:36:25 -06:00
cli	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-16 12:15:44 -06:00
cloud	Fix mock patch module name	2015-11-05 10:45:30 -07:00
config	Fix SSH Roster Schema unittests	2015-07-28 12:37:19 +01:00
modules	Resolved merge conflict with upstream.	2015-11-11 16:38:31 +00:00
netapi	Add support for cors preflight request for parametrized urls	2015-11-10 18:37:03 +01:00
output	Remove test as well	2015-02-07 11:57:40 -08:00
pillar	More test fixes	2015-07-22 10:40:49 -05:00
renderers	rewrite GPG unit tests	2015-07-16 09:37:37 -06:00
returners	update smtp returner unit tests	2015-05-11 00:23:28 -06:00
serializers	Add new module type for serializers from issue #22257.	2015-05-28 20:03:11 -04:00
states	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-13 15:18:45 -07:00
templates	Derp	2015-06-10 15:50:53 -06:00
transport	Skipping Async tests	2015-09-24 13:41:58 -06:00
utils	marathon and chronos proxy minions	2015-11-12 10:03:38 -07:00
__init__.py
auth_test.py	Fixed unit test	2015-10-23 17:26:15 +03:00
client_test.py	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-03-16 15:12:02 -06:00
context_test.py	Python3 compat for context_test	2015-10-23 11:30:21 -07:00
crypt_test.py	py3: fix salt/crypt.py	2015-06-09 10:19:06 -06:00
files_test.py	Py3 compatibility fixes	2015-01-30 22:25:10 +00:00
highstateconf_test.py	Fix test	2015-08-18 08:51:00 -06:00
log_test.py	Manual merge of #24414 per thatch45	2015-06-06 07:47:52 -06:00
minion_test.py	Fix misc tests	2015-04-07 20:53:27 -07:00
payload_test.py	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-11 13:15:38 -06:00
pillar_test.py	Unit test for merging included pillars.	2015-10-28 21:45:26 +01:00
pydsl_test.py	tests/unit/pydsl_test.py: remove raw string formatting	2015-08-26 23:26:08 -05:00
pyobjects_test.py	Fix loader call in pyobjects	2015-06-18 09:11:45 -06:00
simple.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
spm_test.py	Make sure spm tests are picked up by runtests.	2015-09-14 17:54:51 +01:00
stateconf_test.py	Allow parent relative includes in state files	2015-07-21 16:32:38 +10:00
template_test.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
version_test.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00