rallytime e0ae50e489 Merge branch '2017.7' into 'develop' ... Conflicts: - pkg/salt.bash - salt/client/mixins.py - salt/minion.py - salt/modules/aptpkg.py - salt/modules/boto_vpc.py - salt/modules/win_pkg.py - salt/utils/reactor.py - tests/unit/utils/test_reactor.py		2017-09-22 10:24:04 -04: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 NAPALM logo	2017-05-04 09:09:08 +00:00
_templates
_themes	Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7	2017-06-28 20:27:32 -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	multiprocessing minion option: documentation fixes	2017-09-21 11:30:21 +02:00
ref	Merge branch '2017.7' into 'develop'	2017-09-22 10:24:04 -04:00
security
topics	Merge branch '2017.7' into 'develop'	2017-09-22 10:24:04 -04: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	[develop] Bump latest and previous versions	2017-08-15 13:32:01 -04:00
contents.rst	Merge branch 'nitrogen' into 'develop'	2017-05-26 11:27:24 -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 Stormpath module, states and docs	2017-08-14 16:03:00 -06:00