Colton Myers b509cdfa4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/conf.py salt/cloud/clouds/gce.py salt/cloud/clouds/linode.py salt/grains/ssds.py salt/modules/git.py salt/modules/pip.py tests/integration/cloud/providers/gogrid.py tests/integration/cloud/providers/linode.py tests/integration/cloud/providers/msazure.py tests/integration/cloud/providers/rackspace.py tests/unit/modules/pip_test.py		2015-08-28 16:33:54 -06:00
..
providers	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-08-28 16:33:54 -06:00
__init__.py	salt-cloud tests for linode	2014-06-09 14:49:49 -06:00