Colton Myers 2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/conf.py doc/topics/cloud/gce.rst salt/cli/api.py salt/cli/call.py salt/cli/cp.py salt/cli/key.py salt/cli/run.py salt/cli/salt.py salt/modules/dockerio.py salt/states/dockerio.py		2015-09-17 10:54:33 -06:00
..
cloud.maps.d	Fixing up salt-cloud sample configs	2013-11-20 08:48:01 -07:00
cloud.profiles.d	Get rid of Micro Instance examples	2014-09-27 11:09:08 -06:00
cloud.providers.d	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
cloud	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-17 10:54:33 -06:00
cloud.profiles	Get rid of Micro Instance examples	2014-09-27 11:09:08 -06:00
cloud.providers	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
master	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-17 10:54:33 -06:00
minion	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-17 10:54:33 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00