rallytime c0f16dae74 Merge branch '2017.7' into 'develop' ... Conflicts: - doc/topics/tutorials/index.rst - salt/crypt.py - salt/modules/cmdmod.py - salt/modules/grains.py - salt/pillar/git_pillar.py - salt/roster/clustershell.py - tests/unit/states/test_augeas.py - tests/unit/utils/test_utils.py		2017-10-16 15:26:19 -04:00
..
conventions	Add clarification on how to participate once in the Contributors team	2017-07-31 10:42:12 -06:00
extend	Fix templates for the new test module naming scheme	2017-02-23 23:19:44 +00:00
git	Remove repeated words in docs (#37871)	2016-11-23 14:53:17 -07:00
raet	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
tests	Merge branch '2017.7' into 'develop'	2017-10-16 15:26:19 -04:00
architecture.rst	Fix typo an deamon -> daemon	2015-11-04 11:06:16 +01:00
contributing.rst	Add GPG Verification section to Contributing Docs	2017-09-26 10:16:56 -04:00
deprecations.rst	Move 4 functions from salt.utils to salt.utils.versions	2017-08-15 12:53:57 -05:00
dunder_dictionaries.rst	Update modules doc	2017-06-08 13:45:14 +02:00
external_pillars.rst	Updates documentation for external_pillar - Fixes Bash Example	2015-07-14 14:26:00 -07:00
hacking.rst	Update hacking.rst	2017-04-05 15:12:08 +10:00
index.rst	start doc layout	2016-07-27 19:56:35 +10:00
labels.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
logging.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
modular_systems.rst	Various doc updates to fix warnings in doc build	2017-02-06 16:56:58 -07:00
package_providers.rst	Move 13 functions from salt.utils to salt.utils.data	2017-10-10 17:42:42 -05:00
pull_requests.rst	add pull requests doc	2016-10-21 13:26:18 -06:00
reporting_bugs.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
topology.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
translating.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
tutorial.rst	Update tutorial.rst	2016-10-12 10:34:28 -06:00