rallytime 29f45c192c Merge branch '2016.11' into 'develop' ... Conflicts: - salt/cloud/clouds/ec2.py - salt/modules/grains.py		2016-12-12 11:23:57 -07:00
..
__init__.py	salt-cloud tests for linode	2014-06-09 14:49:49 -06:00
digital_ocean.py	change timeout for cloud tests	2016-10-25 13:27:57 -06:00
ec2.py	enabled ec2 cloud tests	2016-12-08 12:39:42 -07:00
gce.py	change timeout for cloud tests	2016-10-25 13:27:57 -06:00
gogrid.py	change timeout for cloud tests	2016-10-25 13:27:57 -06:00
joyent.py	change timeout for cloud tests	2016-10-25 13:27:57 -06:00
linode.py	change timeout for cloud tests	2016-10-25 13:27:57 -06:00
msazure.py	add timeout increase on azure tests	2016-11-15 10:27:44 -07:00
openstack.py	Add test to check openstack in libcloud	2016-09-13 10:25:43 -05:00
profitbricks.py	Cloud API v3 updates including:	2016-11-01 21:37:53 +00:00
rackspace.py	change timeout for cloud tests	2016-10-25 13:27:57 -06:00
virtualbox.py	fix import for virtualbox test	2016-11-14 14:48:37 -07:00
vultr.py	change timeout for cloud tests	2016-10-25 13:27:57 -06:00