salt/doc/ref
Colton Myers 26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    doc/conf.py
    salt/config/__init__.py
    salt/modules/rh_ip.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/user.py
    salt/templates/rh_ip/rh7_eth.jinja
2015-09-17 11:10:37 -06:00
..
auth/all Add autosummary-generated docs 2015-07-17 17:53:16 -06:00
beacons/all Add autosummary-generated docs 2015-07-17 17:53:16 -06:00
cli Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-09-03 14:24:45 -06: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 documentation for zip archive modules 2015-08-26 12:18:57 -06:00
engines/all Adding salt.engines.sqs_events.rst to doc 2015-04-13 12:20:42 -04:00
file_server Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-09 11:41:07 -06:00
internals Do not reference serializers from aggregation docs. 2015-05-28 20:04:20 -04:00
modules Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-09-17 11:10:37 -06:00
netapi/all Whitespace cleanup 2014-12-11 07:53:20 -08:00
output/all Added autosummary generated placeholders for the new module docs 2015-03-02 14:07:18 -07:00
pillar Add autosummary-generated docs 2015-07-17 17:53:16 -06:00
renderers Allow parent relative includes in state files 2015-07-21 16:32:38 +10:00
returners Add all new modules to autosummary docs 2015-07-17 15:53:13 -06:00
roster/all Add missing RST file 2015-05-06 12:06:49 -05:00
runners Merge branch develop 2015-08-10 13:43:13 -04:00
sdb/all Add autosummary-generated docs 2015-07-17 17:53:16 -06:00
serializers/all Add all new modules to autosummary docs 2015-07-17 15:53:13 -06:00
states Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-09-17 11:10:37 -06: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
clientacl.rst Typo in client_acl ref doc. 2015-07-14 08:54:32 -06:00
index.rst Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-03-30 15:10:17 -06:00
peer.rst Whitespace cleanup 2014-12-11 07:53:20 -08:00
python-api.rst Whitespace cleanup 2014-12-11 07:53:20 -08:00