Colton Myers 26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/conf.py salt/config/__init__.py salt/modules/rh_ip.py salt/pillar/s3.py salt/returners/local_cache.py salt/states/user.py salt/templates/rh_ip/rh7_eth.jinja		2015-09-17 11:10:37 -06:00
..
index.rst	release notes updates	2015-09-14 14:52:14 -06:00
salt.cloud.clouds.aliyun.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt.cloud.clouds.botocore_aws.rst	Added autodoc generated cloud module docs	2013-11-11 16:25:28 -07:00
salt.cloud.clouds.cloudstack.rst	Added autodoc generated cloud module docs	2013-11-11 16:25:28 -07:00
salt.cloud.clouds.digital_ocean.rst	Added autodoc generated cloud module docs	2013-11-11 16:25:28 -07:00
salt.cloud.clouds.ec2.rst	Added autodoc generated cloud module docs	2013-11-11 16:25:28 -07:00
salt.cloud.clouds.gce.rst	Added docs for new execution and state modules	2013-12-12 23:29:56 -07:00
salt.cloud.clouds.gogrid.rst	Added autodoc generated cloud module docs	2013-11-11 16:25:28 -07:00
salt.cloud.clouds.joyent.rst	Added autodoc generated cloud module docs	2013-11-11 16:25:28 -07:00
salt.cloud.clouds.libcloud_aws.rst	Added autodoc generated cloud module docs	2013-11-11 16:25:28 -07:00
salt.cloud.clouds.linode.rst	Added autodoc generated cloud module docs	2013-11-11 16:25:28 -07:00
salt.cloud.clouds.lxc.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt.cloud.clouds.msazure.rst	Added docs for new execution and state modules	2013-12-12 23:29:56 -07:00
salt.cloud.clouds.nova.rst	Added autodoc generated cloud module docs	2013-11-11 16:25:28 -07:00
salt.cloud.clouds.opennebula.rst	Added generated templates for the new additions	2014-04-17 12:20:07 -06:00
salt.cloud.clouds.openstack.rst	Added autodoc generated cloud module docs	2013-11-11 16:25:28 -07:00
salt.cloud.clouds.parallels.rst	Added autodoc generated cloud module docs	2013-11-11 16:25:28 -07:00
salt.cloud.clouds.proxmox.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt.cloud.clouds.pyrax.rst	Added autosummary generated placeholders for the new module docs	2015-03-02 14:07:18 -07:00
salt.cloud.clouds.qingcloud.rst	Add autosummary-generated docs	2015-07-17 17:53:16 -06:00
salt.cloud.clouds.rackspace.rst	Added autodoc generated cloud module docs	2013-11-11 16:25:28 -07:00
salt.cloud.clouds.saltify.rst	Added autodoc generated cloud module docs	2013-11-11 16:25:28 -07:00
salt.cloud.clouds.scaleway.rst	Add autosummary-generated docs	2015-07-17 17:53:16 -06:00
salt.cloud.clouds.softlayer_hw.rst	Added generated templates for the new additions	2014-04-17 12:20:07 -06:00
salt.cloud.clouds.softlayer.rst	Added autodoc generated cloud module docs	2013-11-11 16:25:28 -07:00
salt.cloud.clouds.vmware.rst	Excluding get_configured_provider() and script() from sphinx	2015-03-30 14:22:23 -04:00
salt.cloud.clouds.vsphere.rst	Added generated templates for the new additions	2014-04-17 12:20:07 -06:00