rallytime 36a1bcf8c5 Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/win_wua.py - salt/utils/schedule.py - tests/unit/modules/rabbitmq_test.py		2017-07-27 14:00:15 -06:00
..
_ext	Adding Jinja cross ref	2017-06-19 09:49:45 +00: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	Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7	2017-06-28 20:27:32 -05:00
.scripts
.tx	Remove deprecated vsphere cloud driver in Carbon release	2016-08-05 16:16:12 -06:00
cheatsheet
man	Fix comments about the "hash_type" option	2017-05-09 11:10:29 -06:00
ref	Merge branch '2016.11' into '2017.7'	2017-07-27 14:00:15 -06:00
security
topics	Merge branch '2016.11' into '2017.7'	2017-07-27 14:00:15 -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	update windows urls to new py2/py3 naming scheme	2017-07-21 11:22:57 -06:00
contents.rst	add venafi to table of contents	2017-05-25 10:27:40 -06:00
faq.rst	Merge branch '2016.11' into '2017.7'	2017-07-18 09:05:43 -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	Do not require sphinx-build for cleaning docs	2017-05-23 17:14:11 +02:00
spelling_wordlist.txt	Remove dockerio state/module (moved to salt-contrib)	2017-02-18 21:58:24 -06:00