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	Add all new modules to autosummary docs	2015-07-17 15:53:13 -06:00
salt.sdb.couchdb.rst	Added autodoc generated pages for the new modules types	2015-04-03 12:45:49 -06:00
salt.sdb.etcd_db.rst	Added the etcd sdb module to the module index	2015-03-26 11:52:21 -04:00
salt.sdb.keyring_db.rst	Added generated .rst files for the various sdb modules	2015-03-25 17:11:20 -04:00
salt.sdb.memcached.rst	Added generated .rst files for the various sdb modules	2015-03-25 17:11:20 -04:00
salt.sdb.rest.rst	Updated module doc index using https://github.com/saltstack/salt/pull/27203	2015-09-22 11:54:34 -06:00
salt.sdb.sqlite3.rst	Added generated .rst files for the various sdb modules	2015-03-25 17:11:20 -04:00