Colton Myers 076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 ... Conflicts: README.rst doc/conf.py doc/ref/index.rst doc/ref/proxy/all/salt.proxy.ssh_sample.rst doc/topics/installation/rhel.rst doc/topics/releases/2015.8.4.rst doc/topics/tutorials/states_pt5.rst salt/cloud/clouds/ec2.py salt/cloud/clouds/opennebula.py salt/config/__init__.py salt/modules/boto_dynamodb.py salt/modules/boto_ec2.py salt/modules/boto_elasticache.py salt/modules/boto_elb.py salt/modules/boto_iam.py salt/modules/boto_rds.py salt/modules/boto_sns.py salt/modules/boto_sqs.py salt/modules/dracr.py salt/modules/git.py salt/modules/mine.py salt/modules/systemd.py salt/modules/win_pkg.py salt/modules/yumpkg.py salt/pillar/__init__.py salt/states/git.py salt/states/rabbitmq_vhost.py salt/states/saltmod.py salt/utils/pkg/rpm.py setup.py tests/unit/modules/systemd_test.py tests/unit/states/rabbitmq_vhost_test.py		2016-02-11 22:33:49 -07:00
..
conventions	Change all relevant Boron references to 2016.3.0	2016-02-10 15:45:28 -07:00
git	Whitespace cleanup	2014-12-11 07:53:19 -08:00
raet	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
tests	Fix the wrong "allow to do" phrase	2015-11-04 12:15:41 +01:00
architecture.rst	Fix typo an deamon -> daemon	2015-11-04 11:06:16 +01:00
contributing.rst	Add link to Sending a GH PR to documentation docs	2015-11-03 14:07:49 -07:00
deprecations.rst	Add mention of Periodic Table naming scheme to deprecation docs	2015-10-12 13:08:50 -06:00
dunder_dictionaries.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
external_pillars.rst	Updates documentation for external_pillar - Fixes Bash Example	2015-07-14 14:26:00 -07:00
hacking.rst	Updated dependencies documentation.	2016-01-21 14:43:00 -03:00
index.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
labels.rst	Adding stretch label definition	2015-09-25 10:59:07 -06:00
logging.rst	Updates to salt-ssh and salt-key	2015-08-31 20:00:30 -06:00
modular_systems.rst	Remove overstate documentation	2015-06-12 13:00:08 -06:00
package_providers.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
reporting_bugs.rst	Fix typo relevent -> relevant	2016-02-04 12:54:45 +01:00
salt_projects.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
topology.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
translating.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
tutorial.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00