rallytime cc83fa151a Merge branch '2016.3' into 'develop' ... Conflicts: - salt/modules/status.py - salt/utils/__init__.py - tests/unit/modules/boto_vpc_test.py - tests/unit/modules/mount_test.py - tests/unit/states/boto_vpc_test.py		2016-06-28 17:34:27 -06:00
..
acl	Merge pull request #34025 from rallytime/merge-2016.3	2016-06-15 15:41:00 -04:00
beacons	Added user requirement to the glxinfo beacon	2016-01-07 15:49:32 +01:00
cli	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-16 12:15:44 -06:00
cloud	fix clrf	2016-05-26 08:32:28 +10:00
config	Fix lint: unused import	2016-06-15 14:41:43 +02:00
grains	Pylint fix	2016-06-24 08:28:25 -06:00
modules	Merge branch '2016.3' into 'develop'	2016-06-28 17:34:27 -06:00
netapi	Merge branch '2016.3' into 'develop'	2016-04-26 14:42:26 -06:00
output
pillar	Allow to blacklist/whitelist renderers. (#33358)	2016-05-20 10:41:51 -07:00
renderers	Merge branch '2016.3' into 'develop'	2016-06-24 16:03:11 -06:00
returners	[develop] Merge forward from 2016.3 to develop (#33408)	2016-05-20 13:48:40 -07:00
runners	Merge branch '2016.3' into 'develop'	2016-06-02 10:13:34 -04:00
serializers	add deserializer test, fix deserialization	2015-11-15 14:14:42 -06:00
states	Merge branch '2016.3' into 'develop'	2016-06-28 17:34:27 -06:00
templates	Derp	2015-06-10 15:50:53 -06:00
transport	Skip some tests related to #32902 (#32995)	2016-05-03 08:55:23 -07:00
utils	Addressed unit testing for salt.utils.find	2016-06-24 14:06:17 -06:00
__init__.py	Introduce a lightweight unit test runner for execution modules (#32792)	2016-04-29 13:36:17 -07:00
auth_test.py	Minor lint fix.	2016-06-21 20:47:55 +03:00
client_test.py	Skipped test if zeromq is not transport	2016-03-22 16:01:18 -06:00
context_test.py	Use .next() in contextdict test for py3 (#34106)	2016-06-20 19:32:34 -04:00
crypt_test.py	Bugfix: salt-key crashes if tries to generate keys to the directory w/o write access (#32436)	2016-04-13 08:15:37 -06:00
daemons_test.py	Merge branch '2016.3' into 'develop'	2016-04-26 14:42:26 -06:00
files_test.py
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	New schedule tests and fixes	2016-06-02 17:14:50 +03: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	Allow to blacklist/whitelist renderers. (#33358)	2016-05-20 10:41:51 -07:00
pydsl_test.py	tests/unit/pydsl_test.py: remove env support	2016-02-16 20:33:23 -07:00
pyobjects_test.py	Allow to blacklist/whitelist renderers. (#33358)	2016-05-20 10:41:51 -07:00
simple.py
spm_test.py	Fixup test for spm verbose PR	2015-12-01 11:27:03 -07:00
state_test.py	Update test to correct iteration	2016-06-02 14:32:21 -04:00
stateconf_test.py	Allow parent relative includes in state files	2015-07-21 16:32:38 +10:00
template_test.py	Allow to blacklist/whitelist renderers. (#33358)	2016-05-20 10:41:51 -07:00
version_test.py