Colton Myers 896313bff0 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/pillar/s3.py		2015-09-14 15:01:41 -06:00
..
conventions	Remove overstate documentation	2015-06-12 13:00:08 -06:00
git	Whitespace cleanup	2014-12-11 07:53:19 -08:00
raet	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
tests	Correct spelling of integration in docs	2015-08-12 13:30:03 -04:00
architecture.rst	fix typos	2015-05-14 01:23:20 +02:00
contributing.rst	revise label and milestone documentation	2015-06-27 16:17:44 -06:00
deprecations.rst	rework deprecation documentation for release names	2015-07-29 15:50:33 -06:00
dunder_dictionaries.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
external_pillars.rst	Updates documentation for external_pillar - Fixes Bash Example	2015-07-14 14:26:00 -07:00
hacking.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-08-19 11:29:45 -06:00
index.rst	Merge conflict and rebase.	2014-02-26 13:32:08 -07:00
labels.rst	add GH issue label SPM to docs	2015-09-12 11:14:26 +02:00
logging.rst	Updates to salt-ssh and salt-key	2015-08-31 20:00:30 -06:00
modular_systems.rst	Remove overstate documentation	2015-06-12 13:00:08 -06:00
package_providers.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
reporting_bugs.rst	Document the bug reporting procedure	2015-02-18 09:22:28 -07:00
salt_projects.rst	Whitespace cleanup	2014-12-11 07:53:19 -08: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