From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Feb 2015 11:04:09 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/hammer'
X-Git-Tag: v0.93~86
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a08d3be0533832d5711e44d3f2901fa4a3e79894;p=ceph.git

Merge remote-tracking branch 'gh/hammer'
---

a08d3be0533832d5711e44d3f2901fa4a3e79894