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
..
index.rst	Merge branch '2016.3' into 'develop'	2016-06-15 17:13:26 -06:00
salt.sdb.confidant.rst	Confidant sdb and ext_pillar support (#32757)	2016-04-22 09:12:15 -06:00
salt.sdb.consul.rst	Fixed build errors, additional mock imports, new module docs	2016-03-18 17:37:22 -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 release notes	2016-03-14 16:34:22 -06:00
salt.sdb.sqlite3.rst	Added generated .rst files for the various sdb modules	2015-03-25 17:11:20 -04:00
salt.sdb.vault.rst	Fixed build errors, additional mock imports, new module docs	2016-03-18 17:37:22 -06:00