]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #21969 from zhongyimao/interlock_fast-diff/object-map
authorJason Dillaman <dillaman@redhat.com>
Wed, 13 Jun 2018 20:22:04 +0000 (16:22 -0400)
committerGitHub <noreply@github.com>
Wed, 13 Jun 2018 20:22:04 +0000 (16:22 -0400)
rbd: interlock object-map/fast-diff features together

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

Trivial merge