Colton Myers 716a7e3331 Merge branch '2014.7' into merge-forward ... Conflicts: salt/modules/bsd_shadow.py salt/modules/freebsdjail.py salt/modules/yumpkg.py salt/modules/zfs.py salt/modules/zypper.py salt/netapi/rest_tornado/saltnado.py salt/states/dockerio.py		2014-11-18 12:46:29 -07:00
..
_ssh	2 of 500000	2014-11-06 19:42:59 +00:00
cloud.profiles.d	Don't use HVM image type.	2014-11-03 16:12:21 -07:00
cloud.providers.d	Update ec2 provider and profile config files for cloud nightly tests	2014-09-18 20:41:08 -06:00
cloud	salt-cloud tests for linode	2014-06-09 14:49:49 -06:00
master	Merge branch '2014.7' into merge-forward	2014-11-18 12:46:29 -07:00
minion	Add loop_interval to minion config for tests	2013-05-28 14:27:01 -06:00
sub_minion	Add tests for nested grain/pillar matching	2013-01-26 00:13:51 -06:00
syndic	Simplify the Syndic configuration testing.	2013-07-17 16:22:18 +01:00
syndic_master	Set the tests to still asume pillar_opts	2014-10-13 08:58:20 -06:00