rallytime 5d8d6225b5 Merge branch '2017.7' into 'develop' ... Conflicts: - salt/modules/augeas_cfg.py - salt/netapi/rest_cherrypy/app.py - salt/runners/manage.py - salt/states/boto_cfn.py - salt/utils/cloud.py - tests/integration/states/test_pkg.py		2017-08-10 14:47:14 -04:00
..
auth/all	Add salt.auth.file module for simple file based authentication	2017-05-02 10:26:57 -04:00
beacons/all	Add documentation for the Telegram bot	2017-03-05 16:09:47 +01:00
cache/all	Merge pull request #41142 from FedericoCeratto/mysql_cache	2017-05-30 10:59:32 -05:00
cli	Update Nitrogen references to 2017.7.0 in doc/*	2017-06-14 11:36:06 -06:00
clients	2015.8.8 release docs	2016-03-23 14:00:30 -06:00
clouds/all	Merge branch 'nitrogen' into 'develop'	2017-04-27 10:37:05 -06:00
configuration	Merge pull request #42384 from letsmakesense/patch-1	2017-07-28 09:50:54 -06: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	add option required for metadata server grains	2016-11-17 10:12:43 -06:00
internals	Add a section on updating the fileserver	2017-04-04 13:06:45 -05:00
modules	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05: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	Add new documenation file references to build system for 2017.7	2017-06-16 21:17:33 +00:00
queues/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
renderers	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
returners	Add performance expectations and recommendations to rest_cherrypy docs	2017-05-12 17:57:32 -06:00
roster/all	Adds new Understanding Jinja topic, and fixes several Jinja doc issues.	2016-06-13 18:30:42 -06:00
runners	Merge branch '2017.7' into 'develop'	2017-06-19 14:12:36 -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 '2017.7' into 'develop'	2017-08-10 14:47:14 -04: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	Executors documentation.	2017-05-15 11:41:00 +03:00
peer.rst	Update Nitrogen references to 2017.7.0 in doc/*	2017-06-14 11:36:06 -06: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