Colton Myers 41cad702e3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/minion.py salt/modules/rest_service.py salt/states/dockerng.py salt/utils/cloud.py		2015-09-29 18:13:33 -06:00
..
index.html	Updates to salt-ssh and salt-key	2015-08-31 20:00:30 -06:00
index.rst	Minor doc fixup.	2015-09-28 13:11:58 -06:00
roster.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-29 18:13:33 -06:00