From: Sage Weil Date: Thu, 12 Feb 2015 02:31:39 +0000 (-0800) Subject: Merge remote-tracking branch 'gh/master' into hammer X-Git-Tag: v0.93~51 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3715%2Fhead;p=ceph.git Merge remote-tracking branch 'gh/master' into hammer --- 26dfad798d5193295cbe86902a6bbcf773b03974