From: Josh Durgin <jdurgin@redhat.com>
Date: Mon, 16 Feb 2015 22:30:27 +0000 (-0800)
Subject: Merge branch 'hammer'
X-Git-Tag: v0.93~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6821871769a1425fa24be4fb91fed53beeae641f;p=ceph.git

Merge branch 'hammer'
---

6821871769a1425fa24be4fb91fed53beeae641f