rallytime 0eab957281 Merge branch '2018.3' into 'develop' ... Conflicts: - salt/netapi/rest_tornado/saltnado.py - tests/integration/states/test_file.py - tests/integration/states/test_git.py - tests/unit/modules/test_tls.py		2018-04-20 15:40:49 -04:00
..
auth/all	Add auth.file module to auth documentation page	2018-04-11 11:40:00 -04:00
beacons/all	merge upstream develop	2017-09-27 14:26:32 -06:00
cache/all	Merge pull request #41142 from FedericoCeratto/mysql_cache	2017-05-30 10:59:32 -05:00
cli	Merge branch '2017.7' into 'develop'	2017-11-13 12:27:59 -05:00
clients	2015.8.8 release docs	2016-03-23 14:00:30 -06:00
clouds/all	Merge branch '2017.7' into '2018.3'	2018-03-27 16:31:55 -04:00
configuration	Merge pull request #47084 from bloomberg/26396-docpatch	2018-04-17 16:33:22 -05:00
engines/all	Add napalm_syslog autodoc	2017-03-31 16:03:16 +00:00
executors	Executors documentation.	2017-05-15 11:41:00 +03:00
file_server	document clouds dynamic directory	2017-05-07 20:30:20 -06:00
grains/all	Merge pull request #45528 from spenceation/panos-autodoc	2018-01-18 17:53:37 -05:00
internals	Fix various spelling mistakes	2018-03-08 15:25:42 +01:00
modules	Merge branch '2018.3' into 'develop'	2018-04-20 15:40:49 -04:00
netapi/all	Move the local TOC up since it's such a large docstring	2017-05-12 12:03:26 -06:00
output/all	Merge branch '2016.11' into 'develop'	2017-02-01 16:36:45 -07:00
pillar	Add new documenation file references to build system for 2017.7	2017-06-16 21:17:33 +00:00
proxy/all	Merge branch '2018.3' into 'develop'	2018-04-05 13:25:46 -04:00
queues/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
renderers	Update default renderer to jinja|yaml, improve renderer docs	2018-04-16 22:35:23 -05:00
returners	Merge branch 'oxygen' into 'develop'	2017-12-30 08:49:21 -05:00
roster/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
runners	merge upstream develop	2017-09-27 14:26:32 -06:00
sdb/all	Add autodoc modules for new files in nitrogen	2017-04-11 19:31:33 +00:00
serializers/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
states	Merge branch 'develop' into allow_failhard_override	2018-04-04 10:40:52 +02: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	Merge branch '2017.7' into 'oxygen'	2017-12-21 15:58:08 -05:00
peer.rst	Update Nitrogen references to 2017.7.0 in doc/*	2017-06-14 11:36:06 -06:00
publisheracl.rst	Doc note about user names regex matching in pub acl and eauth.	2018-01-17 17:49:19 +03:00
python-api.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00