16 Commits

Author	SHA1	Message	Date
Colton Myers	0b7ac988cc	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: .pylintrc salt/beacons/service.py salt/beacons/sh.py salt/modules/cassandra_cql.py salt/returners/cassandra_cql_return.py	2015-04-01 14:22:33 -06:00
Colton Myers	c91a593507	Fix test to give more data on failure	2015-03-27 16:50:39 -06:00
Mike Place	14592ed1f9	Adjust batch test	2015-02-27 14:53:58 -07:00
Pedro Algarvio	60f215f191	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
Mike Place	f44e46d080	Adjust batch test	2015-01-05 10:04:15 -07:00
Mike Place	302d5cab39	Fix failing test	2014-12-15 12:04:35 -07:00
Pedro Algarvio	ea89edf3d8	Switch run_ssh with run_function	2014-11-06 23:58:40 +00:00
Daniel Mizyrycki	e421aff68d	Fix lint	2014-10-17 15:39:49 -07:00
Daniel Mizyrycki	54738d0ff5	Added salt-ssh integration test for custom module within SLS	2014-10-17 15:39:49 -07:00
rallytime	210adceeff	Actually, just fix pylint	2014-09-25 12:36:00 -06:00
rallytime	e2dce8acba	Skip ssh grains test for now. Test environment isn't set up to handle it.	2014-09-25 11:47:44 -06:00
Daniel Mizyrycki	e0c6c8c22a	salt-ssh, issue #16129: ... Add integration/regression test for issue affecting grains and pillar subsystem.	2014-09-24 20:58:37 -07:00
rallytime	0000859eb1	pylint fix	2014-07-09 22:31:54 -06:00
rallytime	1acf3ac3a9	Fix batch test	2014-07-09 22:00:41 -06:00
rallytime	1df0c20d97	Pyling fixes	2014-07-09 16:22:00 -06:00
rallytime	56279770a9	Simple integration test to execute a batch command to help catch regressions	2014-07-09 15:41:18 -06:00