Colton Myers a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: doc/topics/releases/version_numbers.rst salt/cli/batch.py salt/minion.py salt/state.py setup.py		2015-06-18 11:43:11 -06: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	Add Feature Matrix link to cloud action and function pages	2015-04-03 16:15:50 -06:00
aliyun.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
aws.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-03 13:47:08 -06:00
azure.rst	Fixing some spninx errors and violations	2015-03-31 12:54:32 -04:00
basic.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
cloud.rst	Merge forward 2015.2->develop	2015-03-01 19:54:22 -07:00
config.rst	Add Getting Started for Scaleway provider	2015-06-04 16:23:06 +02:00
deploy.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
digitalocean.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-05-29 17:33:28 -06:00
features.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-07 10:05:35 -06:00
function.rst	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
gce.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
gogrid.rst	Add versionadded	2015-06-16 15:52:18 -06:00
hpcloud.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
index.html	Salt cloud doc updates, build errors and bug fixes	2015-06-04 16:42:47 -06:00
index.rst	Merge pull request #24459 from basepi/merge-forward-develop	2015-06-08 22:27:08 -06:00
joyent.rst	Joyent now requires a keyname to be set	2015-02-19 14:52:08 -07:00
linode.rst	add information about linode location	2015-06-17 17:43:08 +02:00
lxc.rst	lxc docs: typos	2015-05-23 14:49:34 +02:00
map.rst	Add warning about destroying maps	2015-06-01 15:25:58 -06:00
misc.rst	Allow Salt Cloud to use either SCP or SFTP, as configured	2015-05-14 10:49:20 -06:00
openstack.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
parallels.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
profiles.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
proxmox.rst	Merge remote-tracking branch 'salt/2014.7' into 2015.2	2015-02-18 11:33:10 -07:00
rackspace.rst	Add private subnets	2015-01-02 19:28:45 -08:00
reactor.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
salt.rst	Comma Cleanup	2014-12-12 11:32:16 -08:00
scaleway.rst	Add Getting Started for Scaleway provider	2015-06-04 16:23:06 +02:00
softlayer.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
troubleshooting.rst	Comma Cleanup	2014-12-12 11:32:16 -08:00
vexxhost.rst	Added documentation for VEXXHOST cloud	2014-04-22 21:05:03 -04:00
vmware.rst	Show same examples for memory	2015-06-07 04:21:07 -04:00
vsphere.rst	Add Getting Started with VSphere doc to 2015.5	2015-06-08 10:23:47 -06:00
windows.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2	2015-05-29 15:10:13 -06:00