rallytime 5372f25fde Merge branch '2016.11' into 'nitrogen' ... Conflicts: - salt/cloud/clouds/rackspace.py - tests/unit/cloud/clouds/test_dimensiondata.py		2017-04-24 15:35:28 -06:00
..
_ext	Add conf_proxy cross reference	2017-03-28 18:24:02 +03:00
_incl	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
_static	Add ability to clone from a snapshot to salt-cloud vmware driver	2016-09-12 14:49:20 -04:00
_templates
_themes	Add "Edit on GitHub" link to the docs	2017-03-01 00:34:22 -05:00
.scripts	Remove raw string formatting in doc/, salt/auth/, and salt/cloud/	2015-08-24 17:48:10 -05:00
.tx	Remove deprecated vsphere cloud driver in Carbon release	2016-08-05 16:16:12 -06:00
cheatsheet	re-add cheatsheet do-over	2015-09-17 09:32:52 -06:00
man	Add logstash engine protocol to manual	2017-03-24 17:03:22 +01:00
ref	Merge branch '2016.11' into 'nitrogen'	2017-04-24 15:35:28 -06:00
security	Fixing more sphinx/docs errors and warnings	2015-05-16 19:24:04 -04:00
topics	Merge branch '2016.11' into 'nitrogen'	2017-04-24 15:35:28 -06:00
apidoc-saltmods.sh	New doc site layout, 2016.3.0 release note known issue additions	2016-05-25 17:39:55 -06:00
conf.py	Merge branch '2016.11' into 'nitrogen'	2017-04-24 15:35:28 -06:00
contents.rst	Add documentation for the Minion data cache	2017-03-24 11:49:26 -06:00
faq.rst	Merge branch '2016.11' into 'develop'	2017-03-30 12:32:24 -06:00
gen_gource	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
glossary.rst	Merge branch '2016.11' into 'develop'	2017-02-09 10:29:40 -07:00
Makefile	Whitespace fix in docs Makefile	2017-02-09 19:19:09 +01:00
spelling_wordlist.txt	Remove dockerio state/module (moved to salt-contrib)	2017-02-18 21:58:24 -06:00