]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitad89b795f08af99734b8ebf5371129047630aa23
tree879c055f79c0473cbfd13077f8f41cd5cfd4b865
parent10edd56957b9c72965ffd73ecbb6d05c6f41c9c3
parent8d5bee2d46ae6d5493c1fe6fb3036a3552f7713c
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>