valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
ec6cd80496
salt/doc/ref
History
Colton Myers ec6cd80496 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    doc/ref/auth/all/index.rst
    doc/ref/auth/all/salt.auth.rest.rst
    doc/ref/beacons/all/index.rst
    doc/ref/beacons/all/salt.beacons.ps.rst
    doc/ref/pillar/all/index.rst
    doc/ref/pillar/all/salt.pillar.consul_pillar.rst
    doc/ref/pillar/all/salt.pillar.neutron.rst
    doc/ref/pillar/all/salt.pillar.sql_base.rst
    doc/ref/pillar/all/salt.pillar.sqlite3.rst
    doc/ref/sdb/all/salt.sdb.rest.rst
    salt/modules/rh_ip.py
    salt/utils/http.py
2015-09-22 15:31:46 -06: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 remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-09-18 11:03:37 -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 default log_level is info, not warning 2015-09-18 13:59:45 -07: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-22 15:31:46 -06: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 Updated module doc index using https://github.com/saltstack/salt/pull/27203 2015-09-22 11:54:34 -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 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-09-22 15:31:46 -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 Updated module doc index using https://github.com/saltstack/salt/pull/27203 2015-09-22 11:54:34 -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