rallytime cded9ac01d Merge branch '2015.8' into 'develop' ... Conflicts: - salt/cloud/clouds/vmware.py - salt/modules/freebsdpkg.py - salt/modules/virtualenv_mod.py - salt/states/boto_asg.py - tests/integration/__init__.py - tests/runtests.py		2015-11-06 09:34:31 -07:00
..
conventions	Merge branch '2015.5' into '2015.8'	2015-11-04 15:52:59 -07: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	Fix the wrong "allow to do" phrase	2015-11-04 12:15:41 +01:00
architecture.rst	Fix typo an deamon -> daemon	2015-11-04 11:06:16 +01:00
contributing.rst	Add link to Sending a GH PR to documentation docs	2015-11-03 14:07:49 -07:00
deprecations.rst	Add mention of Periodic Table naming scheme to deprecation docs	2015-10-12 13:08:50 -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 branch '2015.8' into develop	2015-11-04 15:40:03 -07:00
index.rst	Merge conflict and rebase.	2014-02-26 13:32:08 -07:00
labels.rst	Adding stretch label definition	2015-09-25 10:59:07 -06: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