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
..
access_control.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
index.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-08-11 18:12:21 -06:00