From: Josh Durgin <jdurgin@redhat.com>
Date: Tue, 10 Mar 2015 22:42:21 +0000 (-0700)
Subject: Merge branch 'wip-11067' into hammer
X-Git-Tag: v0.94~47
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3651be6b9768eb902a3e3f06f62c60642d9a94a5;p=ceph.git

Merge branch 'wip-11067' into hammer

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

3651be6b9768eb902a3e3f06f62c60642d9a94a5