From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 18 Dec 2015 14:06:03 +0000 (-0500)
Subject: Merge pull request #6958 from xiexingguo/patch-1
X-Git-Tag: v10.0.3~210
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=deaf2c1bf17e2eaefd5d24098c007d27e38efb4d;p=ceph.git

Merge pull request #6958 from xiexingguo/patch-1

librbd: return error if we fail to delete object_map head object

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

deaf2c1bf17e2eaefd5d24098c007d27e38efb4d