rallytime 235a768872 Merge branch '2016.11' into 'develop' ... Conflicts: - salt/returners/influxdb_return.py - salt/states/dockerng.py - salt/utils/schedule.py - tests/unit/modules/test_docker.py - tests/unit/states/dockerng_test.py - tests/unit/utils/test_schedule.py		2017-03-22 17:44:08 -06:00
..
auth/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
beacons/all	Add documentation for the Telegram bot	2017-03-05 16:09:47 +01:00
cache/all	Redis cache doc	2017-01-30 16:24:04 +00:00
cli	Remove doc markup references from 2016.11 branch	2016-12-19 15:14:37 -07:00
clients	2015.8.8 release docs	2016-03-23 14:00:30 -06:00
clouds/all	Various doc updates to fix warnings in doc build	2017-02-06 16:56:58 -07:00
configuration	Merge branch '2016.11' into 'develop'	2017-03-22 17:44:08 -06:00
engines/all	Update autodoc topics for new modules added in develop	2017-02-02 10:12:58 -07:00
executors/all	Add a bunch of missing doc module references	2017-01-31 15:12:34 -07:00
file_server	Add file-roots-directory-overlay anchor	2017-02-23 22:14:25 -06:00
grains/all	add option required for metadata server grains	2016-11-17 10:12:43 -06:00
internals	Developer documentation for Unicode handling (#35593)	2016-08-25 15:30:31 -06:00
modules	Add logmod doc	2017-03-16 14:00:39 +00:00
netapi/all	Remove netapi autodoc files: they should not be added as their doc structure is different	2016-12-19 17:00:20 +00:00
output/all	Merge branch '2016.11' into 'develop'	2017-02-01 16:36:45 -07:00
pillar	Update autodoc topics for new modules added in develop	2017-02-02 10:12:58 -07:00
proxy/all	Add a bunch of missing doc module references	2017-01-31 15:12:34 -07:00
queues/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
renderers	Update autodoc topics for new modules added in develop	2017-02-02 10:12:58 -07:00
returners	updating documentation for librato returner	2017-03-09 10:04:46 -08:00
roster/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
runners	Update autodoc topics for new modules added in develop	2017-02-02 10:12:58 -07:00
sdb/all	Update autodoc topics for new modules added in develop	2017-02-02 10:12:58 -07:00
serializers/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
states	Overhaul Docker support	2017-03-21 16:53:19 -05:00
thorium/all	Add a bunch of missing doc module references	2017-01-31 15:12:34 -07:00
tops	Remove repeated words in docs (#37871)	2016-11-23 14:53:17 -07:00
wheel/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
index.rst	Add documentation for the Minion data cache	2017-01-19 15:53:22 -07:00
peer.rst	Add clarification on expr_form usage and future deprecation (#37964)	2016-11-29 13:45:11 -07:00
publisheracl.rst	Remove support for client_acl and client_acl_blacklist	2016-12-19 16:18:48 -07:00
python-api.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00