Colton Myers 2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/topology/syndic.rst salt/client/__init__.py salt/daemons/masterapi.py salt/minion.py salt/modules/dockerio.py		2015-03-19 16:03:29 -06:00
..
cli	Adjust batch test	2015-02-27 14:53:58 -07:00
client	Switch open() for salt.utils.fopen()	2014-11-26 17:39:49 +00:00
cloud	Move tearDown functionality into test_instance	2015-02-27 14:53:54 -07:00
files	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-03-19 16:03:29 -06:00
fileserver	Pylint fix - remove unused import	2015-02-11 09:35:04 -07:00
loader	pylint	2015-02-12 17:06:41 -08:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-03-11 16:09:57 -06:00
netapi	Add timeout to saltnado's event listener	2015-03-18 08:09:41 -07:00
output	Fix imports	2015-02-26 09:41:22 +00:00
runners	Fix test_envs fileserver runner test	2015-03-10 11:28:59 -05:00
shell	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-03-19 16:03:29 -06:00
ssh	More Pylint	2014-05-23 15:27:19 -06:00
states	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-03-09 11:50:21 -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	Pass opts not an ImmutableDict of opts	2015-01-28 18:43:45 -08:00
__init__.py	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-02-06 13:00:14 -07:00