salt/doc/ref
Mike Place 7e424e10f2 Merge pull request #28054 from dr4Ke/custom_grains_deep_merge
loader uses a deep dictionary merge for the grains (core and customs)
2015-12-01 10:33:52 -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 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-09-22 15:31:46 -06:00
cli Merge branch '2015.8' into develop 2015-11-04 15:40:03 -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 remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-09-17 11:10:37 -06:00
configuration grains_deep_merge config option documentation 2015-11-18 20:48:11 +01:00
engines/all Add logentries engine 2015-11-30 13:58:10 +00:00
file_server Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-09-29 14:56:41 -06:00
internals Do not reference serializers from aggregation docs. 2015-05-28 20:04:20 -04:00
modules generate docs for fmadm module 2015-11-25 14:43:38 +00:00
netapi/all Updated module doc index using https://github.com/saltstack/salt/pull/27203 2015-09-22 11:54:34 -06:00
output/all Added autosummary generated placeholders for the new module docs 2015-03-02 14:07:18 -07:00
pillar Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-09-22 15:31:46 -06:00
proxy/all More docs. 2015-10-19 13:19:20 -06:00
queues/all Updated module doc index using https://github.com/saltstack/salt/pull/27203 2015-09-22 11:54:34 -06: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 Add missing RST file 2015-05-06 12:06:49 -05:00
runners Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-09-18 11:03:37 -06:00
sdb/all Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-09-22 15:31:46 -06:00
serializers/all Add all new modules to autosummary docs 2015-07-17 15:53:13 -06:00
states doc for salt.states.smartos 2015-11-18 17:21:57 -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 Deprecate client_acl with publisher_acl (rename) 2015-10-23 11:59:40 +03:00
peer.rst Whitespace cleanup 2014-12-11 07:53:20 -08:00
publisheracl.rst Deprecate client_acl with publisher_acl (rename) 2015-10-23 11:59:40 +03:00
python-api.rst Whitespace cleanup 2014-12-11 07:53:20 -08:00