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 |
|
Jacob Hammons
|
7ac98a03b6
|
Updated module doc index using https://github.com/saltstack/salt/pull/27203
|
2015-09-22 11:54:34 -06:00 |
|
Seth House
|
7422385e24
|
Add autosummary-generated docs
|
2015-07-17 17:53:16 -06:00 |
|
Seth House
|
1210a53685
|
Add all new modules to autosummary docs
|
2015-07-17 15:53:13 -06:00 |
|
Seth House
|
6be273d5f3
|
Removed stormpath_mod and linodepy docs; these were renamed
|
2015-05-01 14:24:00 -06:00 |
|
Seth House
|
57b1f67daa
|
Added autosummary generated placeholders for the new module docs
|
2015-03-02 14:07:18 -07:00 |
|
Seth House
|
1382401618
|
Updated all the module index pages with the latest/newest modules
|
2015-03-02 13:59:19 -07:00 |
|
Thomas Jackson
|
f268bb8b4b
|
Whitespace cleanup
|
2014-12-11 07:53:20 -08:00 |
|
Seth House
|
14515c3c8b
|
Added generated templates for the new additions
|
2014-04-17 12:20:07 -06:00 |
|
Seth House
|
d2f057b0fd
|
Combed through all the module types to add recent additions to the docs
|
2014-04-17 12:16:26 -06:00 |
|
Seth House
|
1183924bcb
|
Added new/missing auth modules
|
2013-10-15 16:00:01 -06:00 |
|
Seth House
|
4d77e83d26
|
Added auth modules to the docs & index
|
2013-08-14 16:41:08 -06:00 |
|
Seth House
|
88671c18bb
|
Added auth module docs
O_o how has this not been done yet?
|
2013-08-14 16:41:08 -06:00 |
|