Colton Myers 25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/cloud/action.rst doc/topics/cloud/function.rst doc/topics/reactor/index.rst		2015-04-07 10:05:35 -06:00
..
cli	Fix test to give more data on failure	2015-03-27 16:50:39 -06: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	Remove loop interval setting, was causing cpus to spin	2015-04-03 15:34:47 -06:00
fileserver	Pylint fix - remove unused import	2015-02-11 09:35:04 -07:00
loader	Merge #22246 with pylint fix and test cleanup	2015-04-01 10:29:23 -06: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-31 11:25:27 -06:00
netapi	sort integration test minion return lists	2015-04-06 22:07:56 -06: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 pull request #22319 from plastikos/improvement-pillar_pcre	2015-04-07 09:09:49 -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-04-07 10:05:35 -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	More helper text, refactor filehandles, clean up	2015-04-03 15:34:47 -06:00