From: Sage Weil Date: Thu, 27 Aug 2015 17:07:29 +0000 (-0400) Subject: Merge remote-tracking branch 'gh/wip-12536-hammer' into hammer X-Git-Tag: v0.94.4~83 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=41a245aff77dde8a2ab212f9c91a73a23a77c40d;p=ceph.git Merge remote-tracking branch 'gh/wip-12536-hammer' into hammer This includes wip-osd-compat-hammer. --- 41a245aff77dde8a2ab212f9c91a73a23a77c40d