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
|
4cb33c92d6
|
Added autodoc generated pages for the new modules types
|
2015-04-03 12:45:49 -06:00 |
|
Seth House
|
ef3893d4de
|
Updated module index pages for each of the module types
|
2015-04-03 12:39:13 -06:00 |
|
Seth House
|
714921a5dc
|
Added autosummary placeholders for new models
|
2015-03-02 22:14:33 -07:00 |
|
Seth House
|
b6c1b2601f
|
Added new modules to the module indexes
|
2015-03-02 22:13:42 -07: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 |
|
Seth House
|
a26aef0d7d
|
Added beacon module docs to the module index
|
2015-01-26 18:19:34 -07:00 |
|