From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 3 Dec 2015 14:55:51 +0000 (-0800)
Subject: Merge pull request #6789 from dillaman/wip-13969
X-Git-Tag: v10.0.2~116
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42c6ef446ed459dd7b8e4633ccc0066012e13c38;p=ceph.git

Merge pull request #6789 from dillaman/wip-13969

librbd: partial revert of commit 9b0e359

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

42c6ef446ed459dd7b8e4633ccc0066012e13c38