From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 13 Jun 2018 20:22:04 +0000 (-0400)
Subject: Merge pull request #21969 from zhongyimao/interlock_fast-diff/object-map
X-Git-Tag: v14.0.1~1122
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ad89b795f08af99734b8ebf5371129047630aa23;p=ceph.git

Merge pull request #21969 from zhongyimao/interlock_fast-diff/object-map

rbd: interlock object-map/fast-diff features together

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

ad89b795f08af99734b8ebf5371129047630aa23