salt/doc/ref/configuration
Colton Myers 32f5345d7d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
    conf/minion
    doc/conf.py
    salt/modules/file.py
2015-08-10 10:56:40 -06:00
..
logging Merge branch '2014.7' into merge_forward_fifteen_second_try 2015-01-29 13:42:49 -07:00
examples.rst Whitespace cleanup 2014-12-11 07:53:20 -08:00
index.rst Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-08-10 10:56:40 -06:00
master.rst Doc on using syndic with multimaster 2015-07-31 15:25:15 -06:00
minion.rst Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-08-10 10:56:40 -06:00
nonroot.rst Comma cleanup 2014-12-12 11:34:34 -08:00