rallytime e060a74fd8 Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/cloud/clouds/dimensiondata.py - salt/config/__init__.py - salt/modules/yumpkg.py - salt/pillar/ec2_pillar.py - salt/utils/docker/__init__.py - salt/utils/vault.py - tests/integration/states/test_docker_container.py - tests/unit/modules/test_yumpkg.py - tests/unit/templates/test_jinja.py - tests/unit/utils/test_docker.py		2018-02-14 16:31:31 -05: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 branch '2016.11' into '2017.7'	2017-10-05 12:09:40 -04:00
.scripts
.tx	Remove deprecated vsphere cloud driver in Carbon release	2016-08-05 16:16:12 -06:00
cheatsheet
man	Merge branch '2017.7' into merge-oxygen	2018-01-28 08:51:03 -05:00
ref	Add NetBox module autodoc	2018-02-09 09:45:40 +00:00
security
topics	Merge branch '2017.7' into 'oxygen'	2018-02-14 16:31:31 -05:00
apidoc-saltmods.sh
conf.py	Merge branch '2017.7' into 'oxygen'	2018-02-08 11:23:31 -05:00
contents.rst	Slots documentation.	2018-01-11 14:05:58 +03:00
faq.rst	Fixed Jinja typo in faq.rst	2017-10-02 10:15:02 -05:00
gen_gource
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