salt/doc/topics/development
Colton Myers 3286a5250f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/pillar.rst
    pkg/windows/installer/Salt-Minion-Setup.nsi
    salt/modules/file.py
    salt/modules/schedule.py
    salt/pillar/git_pillar.py
    salt/states/boto_route53.py
    salt/states/pkg.py
    tests/integration/modules/pillar.py
2015-10-30 16:05:26 -06:00
..
conventions Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-10-30 16:05:26 -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 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 Bug fixes and build errors 2015-06-05 17:32:35 -06:00
hacking.rst Fix #28060 2015-10-19 09:54:12 -06: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