rallytime 1fe0b69a6c Merge branch '2016.3' into 'develop' ... Conflicts: - salt/modules/blockdev.py - salt/modules/ddns.py - salt/modules/inspectlib/collector.py - salt/modules/linux_sysctl.py - salt/modules/status.py - salt/modules/x509.py - salt/utils/process.py - salt/utils/verify.py - tests/integration/__init__.py - tests/integration/modules/state.py - tests/integration/states/cmd.py		2016-08-12 16:21:58 -06:00
..
cli	Merge branch '2016.3' into 'develop'	2016-08-12 16:21:58 -06:00
client	Clean up open filehandles (#35359)	2016-08-11 10:45:24 -06:00
cloud	Remove iteritems() references from integration tests	2016-07-19 10:15:23 -06:00
files	Merge branch '2016.3' into 'develop'	2016-08-12 16:21:58 -06:00
fileserver	Add __role to master opts for gitfs integration tests	2016-02-02 21:58:50 -06:00
loader	Make integration.loader.loader tests PY3-compatible	2016-08-03 17:21:31 -05: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	Merge branch '2016.3' into 'develop'	2016-08-12 16:21:58 -06:00
netapi	Fix wheel test	2016-08-03 03:53:15 +09:00
output	Use a path that non-root users can write to for output file	2016-08-02 17:25:22 -05: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	Fixed salt-run integration tests.	2016-08-02 10:01:01 +03:00
sdb	Add SDB module for environment variables	2016-05-25 17:18:35 -04:00
shell	Merge branch '2016.3' into 'develop'	2016-08-12 16:21:58 -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-08-12 16:21:58 -06:00
utils	Avoid str to bytes join in test util (#35295)	2016-08-09 08:47:34 -06: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-08-12 16:21:58 -06:00
fileclient_test.py	Pylint fix	2016-02-29 11:12:55 -07:00