From: Sage Weil <sage@redhat.com>
Date: Thu, 5 Feb 2015 10:18:33 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/hammer'
X-Git-Tag: v0.93~95
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7eca03e290f278bdf3a9613e0f383ec49f40b645;p=ceph.git

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

7eca03e290f278bdf3a9613e0f383ec49f40b645