rallytime cf038ee3fe Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/grains/core.py - salt/modules/file.py - salt/modules/hosts.py - salt/modules/inspectlib/collector.py - salt/modules/portage_config.py - salt/modules/x509.py - salt/scripts.py - tests/integration/shell/enabled.py		2016-08-11 11:33:54 -06:00
..
cli	Merge branch '2015.8' into '2016.3'	2016-08-11 11:33:54 -06:00
client	Clean up open filehandles (#35359)	2016-08-11 10:45:24 -06:00
cloud	Prevent salt-cloud from hanging when spinning up new Vultr instances (#33272)	2016-05-16 13:11:29 -07:00
files	Merge branch '2015.8' into '2016.3'	2016-08-10 10:02:03 -06:00
fileserver	Add __role to master opts for gitfs integration tests	2016-02-02 21:58:50 -06:00
loader	Revert "Modify lodaer global test to use populated dunders"	2016-07-14 12:11:44 -06:00
minion	add integration tests for minion blackout	2016-02-19 18:04:31 -07:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge branch '2015.8' into '2016.3'	2016-08-11 11:33:54 -06:00
netapi	Merge branch '2015.8' into '2016.3'	2016-07-19 09:30:45 -06:00
output	Merge pull request #34025 from rallytime/merge-2016.3	2016-06-15 15:41:00 -04:00
renderers	Add __init__ and pydsl test	2015-11-25 10:50:30 -07:00
runners	Remove unused import	2016-02-19 09:51:18 -07:00
shell	Merge branch '2015.8' into '2016.3'	2016-08-11 11:33:54 -06:00
ssh	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
states	Merge branch '2015.8' into '2016.3'	2016-08-11 11:33:54 -06:00
utils	cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix"	2015-01-28 18:43:43 -08:00
wheel	Fix wheel test	2016-07-21 13:54:32 -06:00
__init__.py	Merge branch '2015.8' into '2016.3'	2016-08-11 11:33:54 -06:00
fileclient_test.py	Pylint fix	2016-02-29 11:12:55 -07:00