From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 10 May 2016 16:47:01 +0000 (-0400)
Subject: Merge pull request #8869 from Abhishekvrshny/wip-15669-jewel
X-Git-Tag: v10.2.1~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f953488b46642ed3825349d41a34b0faeb6a76b;p=ceph.git

Merge pull request #8869 from Abhishekvrshny/wip-15669-jewel

jewel: Errors encountered disabling object-map while flatten is in-progress

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

7f953488b46642ed3825349d41a34b0faeb6a76b