Colton Myers 99e97320e1 Merge branch '2014.7' into develop ... Conflicts: doc/ref/configuration/minion.rst doc/ref/states/requisites.rst doc/topics/troubleshooting/master.rst doc/topics/tutorials/index.rst doc/topics/tutorials/intro_scale.rst salt/config.py salt/key.py salt/master.py salt/minion.py salt/modules/file.py salt/modules/hashutil.py salt/modules/lxc.py salt/modules/oracle.py salt/modules/tls.py salt/modules/win_update.py salt/pillar/pepa.py salt/pillar/s3.py salt/states/augeas.py salt/states/win_update.py salt/tops/ext_nodes.py salt/utils/master.py		2014-09-22 14:22:54 -06:00
..
install	Update docs for using salt-cloud on OSX to install curl-ca-bundle	2014-07-29 15:29:33 -06:00
releases	Replace all occurrences of "Digital Ocean" with "DigitalOcean"	2014-08-25 13:42:01 -06:00
action.rst	Changing aws to ec2 in docs	2013-11-22 10:56:57 -07:00
aliyun.rst	Forget to submit these files for aliyun documents	2014-05-24 15:38:14 +08:00
aws.rst	Merge branch '2014.7' into develop	2014-09-22 14:22:54 -06:00
azure.rst	Merge remote-tracking branch 'upstream/2014.7' into develop	2014-09-16 18:46:48 -05:00
basic.rst	add basic usage doc for salt-cloud	2014-07-10 18:06:43 +07:00
cloud.rst	Add --list-providers and --list-profiles to cloud docs	2014-08-26 00:18:57 -06:00
config.rst	Add support for Digital Ocean's API v2	2014-09-16 17:16:14 +02:00
deploy.rst	Fix all broken links in docs. Ignore certain known-good links. Adjust many links that are returning 301.	2014-02-20 16:16:59 -07:00
digitalocean.rst	Add support for Digital Ocean's API v2	2014-09-16 17:16:14 +02:00
features.rst	Forget to submit these files for aliyun documents	2014-05-24 15:38:14 +08:00
function.rst	Moved salt-cloud documentation into main docs dir	2013-11-08 14:08:36 -07:00
gce.rst	Update salt-cloud gce docs to use downloaded p12 key file	2014-08-24 12:15:04 -06:00
gogrid.rst	Add libcloud dependency notice to provider docs	2014-09-03 20:10:51 -06:00
hpcloud.rst	more copyediting	2014-04-30 13:55:48 -07:00
index.rst	Replace all occurrences of "Digital Ocean" with "DigitalOcean"	2014-08-25 13:42:01 -06:00
joyent.rst	Update cloud docs to note new requests dependency	2014-04-01 12:23:50 -06:00
linode.rst	Merge branch '2014.7' into develop	2014-09-04 13:45:03 -06:00
lxc.rst	Fix numerous typos found via Lintian	2014-08-11 10:46:43 -07:00
map.rst	fix yaml errors in cloud map documentation	2014-06-05 19:34:13 -06:00
misc.rst	document ssh_agent	2014-08-27 21:40:05 -05:00
openstack.rst	Add libcloud dependency notice to provider docs	2014-09-03 20:10:51 -06:00
parallels.rst	Moved salt-cloud documentation into main docs dir	2013-11-08 14:08:36 -07:00
profiles.rst	Explain and remove script examples from profiles	2014-06-06 13:47:28 -06:00
proxmox.rst	Fix wrong permissions	2014-03-23 18:22:35 +00:00
rackspace.rst	Add libcloud dependency notice to provider docs	2014-09-03 20:10:51 -06:00
salt.rst	Fix copy/paste errors in cloud.profile docs	2014-06-06 13:42:49 -06:00
softlayer.rst	more copyediting	2014-04-30 13:55:48 -07:00
troubleshooting.rst	remove 2nd person pronoun	2014-06-16 21:19:32 -05:00
vexxhost.rst	Added documentation for VEXXHOST cloud	2014-04-22 21:05:03 -04:00
windows.rst	Miscellaneous docs fixes	2014-02-03 22:11:56 -06:00