Colton Myers efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/topics/cloud/vmware.rst salt/cloud/clouds/vmware.py salt/grains/chronos.py salt/grains/marathon.py salt/loader.py salt/modules/chronos.py salt/modules/marathon.py salt/proxy/chronos.py salt/proxy/marathon.py salt/state.py salt/states/chronos_job.py salt/states/marathon_app.py salt/states/user.py salt/utils/schedule.py		2015-11-13 15:18:45 -07:00
..
install	Added required update	2015-02-17 14:32:21 +00:00
releases	Comma Cleanup	2014-12-12 11:32:16 -08:00
action.rst	Update linode rest driver docs	2015-06-19 16:15:13 -06:00
aliyun.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
aws.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-10-20 18:13:11 -06:00
azure.rst	Fix typo an transfered -> transferred	2015-11-04 10:59:22 +01:00
basic.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
cloud.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
config.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-22 15:20:17 -06:00
deploy.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
digitalocean.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-02 18:19:01 -07:00
features.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
function.rst	doc: fixed RST markup on Salt Cloud functions	2015-09-25 10:20:53 +02:00
gce.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-10-07 12:06:12 -06:00
gogrid.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
hpcloud.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
index.html	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
index.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-03 14:24:45 -06:00
joyent.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
linode.rst	Require Network Helper over entire account	2015-10-02 12:30:19 -06:00
lxc.rst	Make sure versionchanged is correct	2015-11-06 10:38:48 -05:00
map.rst	Add notes to map and gogrid docs -- don't use -P with map files	2015-06-19 11:02:06 -06:00
misc.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
opennebula.rst	Added "Getting Started with OpenNebula" doc	2015-07-27 13:01:47 -06:00
openstack.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
parallels.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
profiles.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
proxmox.rst	Update proxmox.rst	2015-10-29 13:45:02 -06:00
rackspace.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
reactor.rst	Fix a couple of typos in reactor docs	2015-09-08 14:52:38 -06:00
salt.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
saltify.rst	Update Saltify docs to be more accurate and helpful	2015-08-31 12:02:23 -06:00
scaleway.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
softlayer.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-10-07 13:11:48 -06:00
troubleshooting.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
vexxhost.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
vmware.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-13 15:18:45 -07:00
vsphere.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
windows.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-14 14:39:03 -06:00