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
..
cloud.maps.d	Fixing up salt-cloud sample configs	2013-11-20 08:48:01 -07:00
cloud.profiles.d	Get rid of Micro Instance examples	2014-09-27 11:09:08 -06:00
cloud.providers.d	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
cloud	Fix typo formating -> formatting	2016-02-04 12:45:19 +01:00
cloud.profiles	Get rid of Micro Instance examples	2014-09-27 11:09:08 -06:00
cloud.providers	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
master	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3	2016-02-11 22:33:49 -07:00
minion	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3	2016-02-11 22:33:49 -07:00
proxy	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3	2016-02-11 22:33:49 -07:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00