rallytime 76e8dd974a Merge branch '2016.3' into 'develop' ... Conflicts: - salt/state.py - tests/integration/__init__.py - tests/integration/wheel/key.py		2016-07-26 11:05:24 -06:00
..
cli	Update batch integration tests to not be flaky in Python3	2016-07-22 14:19:15 -06:00
client	Add a test to check for disconnected minion messaging	2016-06-16 14:07:05 -06:00
cloud	Remove iteritems() references from integration tests	2016-07-19 10:15:23 -06:00
files	Merge branch 'develop' into int_tests_interfaces	2016-07-21 12:26:21 -06:00
fileserver	Add __role to master opts for gitfs integration tests	2016-02-02 21:58:50 -06:00
loader	Remove iteritems() references from integration tests	2016-07-19 10:15:23 -06:00
minion	Set timeout for run_salt in test suite	2016-07-22 16:14:25 -06:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Fix grains integration tests for Windows (#34941)	2016-07-26 10:49:10 -06:00
netapi	Merge branch '2016.3' into 'develop'	2016-07-19 10:31:07 -06:00
output	Merge pull request #34025 from rallytime/merge-2016.3	2016-06-15 15:41:00 -04:00
reactor	Event assert (#33262)	2016-05-19 13:41:23 -06:00
renderers	Add __init__ and pydsl test	2015-11-25 10:50:30 -07:00
runners	Add runner for execution modules (#33949)	2016-06-13 11:49:26 -04:00
sdb	Add SDB module for environment variables	2016-05-25 17:18:35 -04:00
shell	Merge branch '2015.8' into '2016.3'	2016-06-29 16:16:46 -06:00
ssh	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
states	Merge branch '2016.3' into 'develop'	2016-07-26 11:05:24 -06:00
utils	Remove repr formatting flag in places where it is used solely for quoting (#34183)	2016-06-29 16:30:18 -04:00
wheel	Merge branch '2016.3' into 'develop'	2016-07-26 11:05:24 -06:00
__init__.py	Merge branch '2016.3' into 'develop'	2016-07-26 11:05:24 -06:00
fileclient_test.py	Pylint fix	2016-02-29 11:12:55 -07:00