Colton Myers 1502a39779 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: conf/minion salt/client/__init__.py salt/states/dockerio.py salt/utils/event.py tests/unit/utils/event_test.py		2015-08-11 18:12:21 -06:00
..
logging	clarify and expand console log colors help	2015-03-26 23:21:30 -06: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	Add warning about file.recurse unicode errors with vim swap files.	2015-08-11 15:16:44 -05:00
minion.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-08-11 18:12:21 -06:00
nonroot.rst	Comma cleanup	2014-12-12 11:34:34 -08:00