salt/doc/topics
Colton Myers 70406867a4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/client/__init__.py
    salt/modules/file.py
    salt/modules/yumpkg.py
    salt/modules/zypper.py
    tests/integration/shell/auth.py
    tests/unit/states/archive_test.py
    tests/unit/states/module_test.py
2015-03-20 20:09:19 -06:00
..
beacons Add return data example 2015-03-09 14:33:12 -06:00
cloud Adding docs for new Azure functionality 2015-03-17 21:58:19 -06:00
development fix contributing doc errors 2015-03-10 16:04:17 -06:00
eauth Add note about ldap module requirement 2015-03-18 14:32:15 -05:00
event Merge forward 2015.2->develop 2015-03-01 19:54:22 -07:00
ext_processes Whitespace cleanup 2014-12-11 07:53:19 -08:00
installation Note change in yosemite max values and warn. 2015-03-12 10:02:53 -06:00
jobs Comma cleanup 2014-12-12 11:40:36 -08:00
master_tops Whitespace cleanup 2014-12-11 07:53:19 -08:00
mine Clarify Mine Functions Aliases documentation 2015-03-10 11:12:17 -07:00
netapi Whitespace cleanup 2014-12-11 07:53:19 -08:00
pillar Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-03-09 12:52:14 -06:00
projects Whitespace cleanup 2014-12-11 07:53:19 -08:00
reactor Merge remote-tracking branch 'salt/2014.7' into 2015.2 2015-02-18 11:33:10 -07:00
releases Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-03-16 15:12:02 -06:00
sdb Whitespace cleanup 2014-12-11 07:53:19 -08:00
ssh Update index.rst salt-ssh doc 2015-03-18 22:35:04 -07:00
targeting Merge branch 'develop' of https://github.com/VynceMontgomery/salt into VynceMontgomery-develop 2015-03-09 11:07:14 -06:00
topology Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-19 16:03:29 -06:00
transports/raet Remove "Lithium" and change to "2015.2.0" for versionadded tags 2015-03-05 12:44:22 -07:00
troubleshooting Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-02-18 11:55:29 -07:00
tutorials Add a note regarding pkg-config to install libgit2 2015-03-20 16:25:35 +01:00
virt Whitespace cleanup 2014-12-11 07:53:19 -08:00
windows Change Github to GitHub 2015-02-15 15:19:54 +01:00
yaml Whitespace cleanup 2014-12-11 07:53:19 -08:00
best_practices.rst Merge branch '2014.7' into develop 2014-12-23 10:57:26 -07:00
index.rst Change Github to GitHub 2015-02-15 15:19:54 +01:00