8 Commits

Author	SHA1	Message	Date
Pedro Algarvio	60f215f191	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
Colton Myers	c4da7bdd64	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/client/mixins.py salt/daemons/flo/__init__.py	2015-01-26 19:44:59 -07:00
Pedro Algarvio	a6c3915049	Fix order for proper diff on failure	2015-01-24 03:16:51 +00:00
Thomas Jackson	925afac98d	Temporarily change this test to work around race condition in the runnerclient ... @rallytime If you have some list of tests that are disabled that shouldn't be, this is one for the list :)	2015-01-10 00:18:16 -08:00
Justin Findlay	b097a1e16b	pre-emptive pylint fix0r	2014-11-11 15:22:40 -07:00
Justin Findlay	abb3ba87bf	integration test: known JID through netapi #15763	2014-11-11 15:15:36 -07:00
rallytime	96a1288808	Add minions_denied to netapi test	2014-10-14 16:49:07 -06:00
Pedro Algarvio	5e4eb4bbaf	Don't add tests in __init__	2014-10-08 01:02:10 +01:00