salt/doc/ref/auth/all
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
..
index.rst Updated module doc index using https://github.com/saltstack/salt/pull/27203 2015-09-22 11:54:34 -06:00
salt.auth.auto.rst Added new/missing auth modules 2013-10-15 16:00:01 -06:00
salt.auth.django.rst Added autosummary generated placeholders for the new module docs 2015-03-02 14:07:18 -07:00
salt.auth.keystone.rst Added auth modules to the docs & index 2013-08-14 16:41:08 -06:00
salt.auth.ldap.rst Added auth modules to the docs & index 2013-08-14 16:41:08 -06:00
salt.auth.mysql.rst Added autosummary generated placeholders for the new module docs 2015-03-02 14:07:18 -07:00
salt.auth.pam.rst Added auth modules to the docs & index 2013-08-14 16:41:08 -06:00
salt.auth.pki.rst Added generated templates for the new additions 2014-04-17 12:20:07 -06:00
salt.auth.rest.rst Updated module doc index using https://github.com/saltstack/salt/pull/27203 2015-09-22 11:54:34 -06:00
salt.auth.sharedsecret.rst Add autosummary-generated docs 2015-07-17 17:53:16 -06:00
salt.auth.stormpath.rst Removed stormpath_mod and linodepy docs; these were renamed 2015-05-01 14:24:00 -06:00
salt.auth.yubico.rst Added autosummary generated placeholders for the new module docs 2015-03-02 14:07:18 -07:00