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
..
auth/all	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-22 15:31:46 -06:00
beacons/all	Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron	2016-01-19 21:57:45 -07:00
cli	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
clients	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-14 14:39:03 -06:00
clouds/all	Merge pull request #30917 from rallytime/remove-botocore-aws-driver	2016-02-10 12:07:14 -07:00
configuration	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3	2016-02-11 22:33:49 -07:00
engines/all	Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron	2016-01-19 21:57:45 -07:00
file_server	doc: fix warnings + some rendering issues	2015-12-21 13:26:02 +01:00
grains/all	Add grains modules to salt modindex	2016-02-02 13:35:49 -07:00
internals	Do not reference serializers from aggregation docs.	2015-05-28 20:04:20 -04:00
modules	Fix some autodoc import warnings from building docs	2016-02-02 12:19:38 -07:00
netapi/all	Remove internal APIs from rest_cherrypy docs.	2015-12-28 15:26:16 -07:00
output/all	Added autosummary generated placeholders for the new module docs	2015-03-02 14:07:18 -07:00
pillar	Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron	2016-01-19 21:57:45 -07:00
proxy/all	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3	2016-02-11 22:33:49 -07:00
queues/all	Merge branch '2015.8' into 'develop'	2016-01-26 16:19:39 -07:00
renderers	Allow parent relative includes in state files	2015-07-21 16:32:38 +10:00
returners	Fixed sphinx / latex build warnings and errors	2015-09-17 09:23:24 -06:00
roster/all	Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron	2016-01-19 21:57:45 -07:00
runners	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
sdb/all	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-22 15:31:46 -06:00
serializers/all	Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron	2016-01-19 21:57:45 -07:00
states	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3	2016-02-11 22:33:49 -07:00
tops	Updated all the module index pages with the latest/newest modules	2015-03-02 13:59:19 -07:00
wheel/all	Updated all the module index pages with the latest/newest modules	2015-03-02 13:59:19 -07:00
index.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3	2016-02-11 22:33:49 -07:00
peer.rst	Changed notes to indicate that functions are matched using regular expressions instead of minions	2016-01-12 11:55:36 -07:00
publisheracl.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
python-api.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00