From: Sage Weil Date: Wed, 19 Aug 2015 13:52:02 +0000 (-0400) Subject: Merge remote-tracking branch 'gh/wip-osd-compat-hammer' into wip-12536-hammer X-Git-Tag: v0.94.4~83^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65b380f7f28a36bb51a6771a2fd9b657ea2848ba;p=ceph.git Merge remote-tracking branch 'gh/wip-osd-compat-hammer' into wip-12536-hammer --- 65b380f7f28a36bb51a6771a2fd9b657ea2848ba