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
..
azure.conf	Revert "Put provider specific information only in provider configuration file"	2014-09-16 08:40:43 -06:00
digital_ocean.conf	Fix digital ocean provider integration tests	2014-06-24 14:33:15 -06:00
ec2.conf	Update ec2 provider and profile config files for cloud nightly tests	2014-09-08 17:06:45 -06:00
gogrid.conf	Initial cloud provider tests for GoGrid	2014-06-12 17:09:57 -06:00
linode.conf	salt-cloud tests for linode	2014-06-09 14:49:49 -06:00
rackspace.conf	Rackspace with openstack driver cloud tests	2014-06-11 11:26:30 -06:00