Colton Myers d7362bb5dd Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: salt/states/file.py salt/utils/event.py		2015-05-22 13:02:54 -06:00
..
__init__.py	salt-cloud tests for linode	2014-06-09 14:49:49 -06:00
digital_ocean.py	Remove key management test from digital ocean cloud tests	2015-05-21 13:37:34 -06:00
ec2.py	Merge branch '2015.2' into develop	2015-02-27 10:02:47 +00:00
gce.py	Working test for extended profile	2015-04-17 15:40:08 +02:00
gogrid.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
joyent.py	Pylint fix	2015-03-05 10:31:13 -07:00
linode.py	The imports do work!	2015-01-30 22:25:29 +00:00
msazure.py	The imports do work!	2015-01-30 22:25:29 +00:00
rackspace.py	The imports do work!	2015-01-30 22:25:29 +00:00