5 Commits

Author	SHA1	Message	Date
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
Justin Findlay	53c9d48331	fix typo	2015-03-17 19:58:05 -06:00
Mike Place	b811f633af	Fix one more failing test	2014-12-10 09:33:54 -07:00
rallytime	19d70dfac5	Added another test to module.run state unit tests	2014-10-24 15:28:03 -06:00
rallytime	f6490e9572	Add initial unit tests for module.run state function	2014-10-24 08:56:40 -06:00