rallytime 9ff2694155 Merge branch '2016.11' into 'nitrogen' ... Conflicts: - pkg/salt-minion.service - salt/modules/junos.py - salt/modules/localemod.py - salt/modules/win_system.py - salt/states/junos.py - tests/unit/modules/test_localemod.py - tests/unit/modules/test_win_powercfg.py - tests/unit/states/dockerng_test.py		2017-05-24 16:32:59 -06:00
..
.scripts
.tx	Remove deprecated vsphere cloud driver in Carbon release	2016-08-05 16:16:12 -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
cheatsheet
man	Fix comments about the "hash_type" option	2017-05-09 11:10:29 -06:00
ref	Merge pull request #41218 from gtmanfred/roster	2017-05-17 14:21:25 -05:00
security
topics	Merge branch '2016.11' into 'nitrogen'	2017-05-24 16:32:59 -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-05-24 16:32:59 -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 'nitrogen'	2017-05-24 16:32:59 -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