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
..
saltstack	Fixing sphinx errors and warnings	2015-05-18 12:12:07 -04:00
saltstack2	master_finger configuration docs	2015-08-06 20:23:22 -06:00