salt/doc/topics
Colton Myers e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
2015-07-30 16:54:44 -06:00
..
beacons Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-11 11:38:03 -06:00
cloud Merge pull request #25764 from gtmanfred/2015.8 2015-07-27 20:40:06 -06:00
development Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-07-30 16:54:44 -06:00
eauth Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-07-08 16:24:58 -06:00
event Clarify the nature of auth and start events. 2015-04-24 12:46:32 -06:00
ext_processes Fixes for doc build errors 2015-05-27 11:40:31 -06:00
highavailability Return to str for master_type for 2015.5 2015-07-24 11:55:56 -06:00
installation Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-07-02 09:46:36 -06:00
jobs Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-07-14 10:57:36 -06:00
master_tops Whitespace cleanup 2014-12-11 07:53:19 -08:00
mine Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-11 13:15:38 -06:00
netapi Whitespace cleanup 2014-12-11 07:53:19 -08:00
pillar Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-07-30 16:54:44 -06:00
projects Whitespace cleanup 2014-12-11 07:53:19 -08:00
reactor Remove overstate documentation 2015-06-12 13:00:08 -06:00
releases Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-07-30 16:54:44 -06:00
sdb Whitespace cleanup 2014-12-11 07:53:19 -08:00
spm Add man page for spm, change pillar to .orig 2015-06-30 09:45:13 -06:00
ssh Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-11 11:38:03 -06:00
targeting Remove references to Beryllium in relevant docs 2015-07-08 11:17:01 -06:00
topology Fixes for doc build errors 2015-05-27 11:40:31 -06:00
transports Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2 2015-05-29 15:10:13 -06:00
troubleshooting Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-09 11:41:07 -06:00
tutorials Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-07-30 16:54:44 -06:00
virt Whitespace cleanup 2014-12-11 07:53:19 -08:00
windows Remove references to Beryllium in relevant docs 2015-07-08 11:17:01 -06:00
yaml Whitespace cleanup 2014-12-11 07:53:19 -08:00
best_practices.rst Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-07-20 13:55:14 -06:00
index.rst Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-16 15:13:53 -06:00