rallytime 4abfd26e86 Merge branch '2017.7' into '2018.3' ... Conflicts: - requirements/dev_python27.txt - requirements/dev_python34.txt - salt/fileclient.py - salt/output/__init__.py - salt/serializers/configparser.py - salt/states/pkg.py - salt/states/zpool.py - salt/transport/tcp.py - tests/integration/cloud/providers/test_ec2.py - tests/integration/modules/test_mac_user.py - tests/integration/modules/test_pip.py - tests/integration/modules/test_pkg.py - tests/integration/modules/test_service.py - tests/integration/states/test_pip_state.py - tests/integration/states/test_user.py - tests/unit/modules/test_cmdmod.py		2018-05-23 12:33:00 -04:00
..
install	Change OSX/OS X to macOS where possible	2016-12-28 14:49:46 -07:00
releases	Merge branch '2016.11' into 'develop'	2016-12-20 10:03:44 -07:00
action.rst	[DOCS] Fix link to Salt Cloud Feature Matrix	2017-08-16 10:26:45 +03: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 branch '2017.7' into '2018.3'	2018-03-15 17:22:05 -04:00
azure.rst	Merge branch 'carbon' into '2016.11'	2016-11-09 12:56:58 -07:00
azurearm.rst	Update documentation for azure arm dependencies	2017-08-10 13:19:45 +10:00
basic.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
cloud.rst	Complete the salt.utils refactor	2017-10-15 09:43:31 -05:00
cloudstack.rst	Fix various spelling mistakes	2018-03-08 15:25:42 +01:00
config.rst	Add extra lines that are needed for proper code-block formatting	2018-05-09 16:10:31 -04:00
deploy.rst	Update link to fedora deploy script	2017-07-24 16:36:38 -04:00
digitalocean.rst	change tags to list based in config	2017-10-11 21:14:27 -04:00
dimensiondata.rst	Remove repeated words in docs (#37871)	2016-11-23 14:53:17 -07:00
features.rst	documentation for vagrant cloud & state	2017-10-11 04:49:47 -06:00
function.rst	[DOCS] Fix link to Salt Cloud Feature Matrix	2017-08-16 10:26:45 +03:00
gce.rst	Update Nitrogen references to 2017.7.0 in doc/*	2017-06-14 11:36:06 -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	documentation for vagrant cloud & state	2017-10-11 04:49:47 -06:00
joyent.rst	Update joyent.rst	2017-08-14 14:35:50 -04:00
libvirt.rst	Update libvirt.rst	2017-07-30 18:33:47 -04:00
linode.rst	Update cloud test profile and docs to use new Linode size lables	2018-05-22 16:00:39 -04:00
lxc.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
map.rst	Update Nitrogen references to 2017.7.0 in doc/*	2017-06-14 11:36:06 -06:00
misc.rst	Update refrences to Oxygen codename to 2018.3.0	2018-02-21 21:47:41 -06:00
oneandone.rst	Initial commit of oneandone salt cloud driver.	2017-08-17 08:03:01 +00:00
opennebula.rst	add spaces for code in docs	2017-05-23 11:35:20 -06:00
openstack.rst	Add getting started openstack doc	2018-03-05 16:25:08 -07: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	Update configuration examples for Joyent	2016-10-25 10:43:32 -06:00
profitbricks.rst	Provide better error message when datacenter is not found.	2017-07-11 17:40:05 +00:00
proxmox.rst	Set True instead of 1	2017-04-04 14:50:03 +02:00
qs.rst	Merge branch '2016.11' into '2017.7'	2017-07-05 09:14:30 -06:00
reactor.rst	Add event_filter to salt cloud	2017-03-13 15:36:13 -06:00
salt.rst	Assorted doc bug fixes	2016-01-07 14:08:30 -07:00
saltify.rst	Fix various spelling mistakes	2018-03-08 19:14:42 +01:00
scaleway.rst	Fix typo in salt-cloud scaleway documentation	2017-10-04 23:23:00 +00:00
softlayer.rst	Support softlayer dedicated host in salt-cloud.	2017-10-25 10:58:12 -03:00
troubleshooting.rst	Remove note about version incompatibility with salt-cloud	2017-06-12 11:16:52 -06:00
vagrant.rst	try to ping node before Wake on Lan	2017-11-06 10:56:41 -07:00
vexxhost.rst	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
virtualbox.rst	Public documentation for salt-cloud virtualbox	2016-02-28 17:29:02 +01:00
vmware.rst	Update refrences to Oxygen codename to 2018.3.0	2018-02-21 21:47:41 -06:00
windows.rst	Merge branch '2017.7' into '2018.3'	2018-04-17 10:54:42 -04:00
xen.rst	new Xen cloud driver	2017-04-12 14:52:07 -06:00