rallytime
9d049e28e5
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/modules/win_pkg.py
- salt/states/disk.py
2016-06-15 17:13:26 -06:00
Jacob Hammons
887a415138
Adds new Understanding Jinja topic, and fixes several Jinja doc issues.
...
Removes the "Full list of builtin ..." from each module reference list, leaving just the module type for scanability.
Refs #12470
Refs #10206
Refs #10480
Refs #23522
Refs #33023
2016-06-13 18:30:42 -06:00
Ryan Lane
9bf18083fb
Confidant sdb and ext_pillar support ( #32757 )
...
* Add an SDB module for confidant
* Add confidant external pillar
* Add docs
2016-04-22 09:12:15 -06:00
Jacob Hammons
e48b84c98f
Fixed build errors, additional mock imports, new module docs
...
Fixes #31975
2016-03-18 17:37:22 -06:00
Jacob Hammons
fd7f7bcddf
Updated release notes
...
Added a shortcut to link to pull requests
Added doc entries for all new modules
removed the unnecessary :undoc-members: option from recent doc module entries
2016-03-14 16:34:22 -06:00
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
8e203c4a0a
Added the etcd sdb module to the module index
2015-03-26 11:52:21 -04:00
Seth House
264c08841e
Added generated .rst files for the various sdb modules
2015-03-25 17:11:20 -04:00
Seth House
c2af83ea3e
Added sdb modules to the module index
2015-03-25 17:08:19 -04:00
