11 Commits

Author	SHA1	Message	Date
Erik Johnson	111a09f2ad	Merge remote-tracking branch 'upstream/2014.7' into develop ... Conflicts: salt/minion.py salt/output/nested.py	2014-09-16 18:46:48 -05:00
rallytime	85f82816c2	Revert "Put provider specific information only in provider configuration file" ... This reverts commit 1ccec204b2.	2014-09-16 08:40:43 -06:00
rallytime	1ccec204b2	Put provider specific information only in provider configuration file	2014-09-16 07:08:18 -06:00
rallytime	a30ccd2a7b	Add cloud provider and profile configuration files	2014-09-15 15:57:27 -06:00
rallytime	40253cb47b	Update ec2 provider and profile config files for cloud nightly tests	2014-09-08 17:06:45 -06:00
rallytime	c001f717a4	Fix digital ocean provider integration tests	2014-06-24 14:33:15 -06:00
rallytime	276affe259	Initial cloud provider tests for GoGrid	2014-06-12 17:09:57 -06:00
rallytime	dd03b59dc6	Rackspace with openstack driver cloud tests	2014-06-11 11:26:30 -06:00
rallytime	da839f9ec7	salt-cloud tests for digital ocean	2014-06-09 14:49:49 -06:00
rallytime	7689a9bc99	salt-cloud tests for linode	2014-06-09 14:49:49 -06:00
Pedro Algarvio	13a9effdaf	Add unit tests regarding include.d directories loading.	2013-12-03 19:08:30 +00:00