rallytime 052b13c98e Merge branch '2017.7' into 'develop' ... Conflicts: - salt/cli/daemons.py - salt/client/ssh/__init__.py - salt/modules/win_pkg.py - salt/netapi/rest_cherrypy/app.py - salt/proxy/fx2.py - salt/utils/__init__.py - salt/utils/jinja.py - salt/utils/napalm.py - salt/utils/path.py - salt/utils/verify.py - tests/integration/modules/test_saltutil.py - tests/integration/states/test_service.py - tests/unit/utils/test_verify.py		2017-11-22 12:36:03 -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	Fixing a typo in the troubleshooting document	2017-10-12 22:28:25 -07:00
ref	Merge branch '2017.7' into 'develop'	2017-11-22 12:36:03 -05:00
security
topics	Merge pull request #44510 from rallytime/merge-develop	2017-11-14 17:21:13 -05: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-09-27 12:31:20 -04:00
contents.rst	Merge branch 'nitrogen' into 'develop'	2017-05-26 11:27:24 -06: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