]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #8565 from dillaman/wip-15471
authorJosh Durgin <jdurgin@redhat.com>
Thu, 14 Apr 2016 15:59:41 +0000 (08:59 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 14 Apr 2016 15:59:41 +0000 (08:59 -0700)
librbd: fix handling of proxied maintenance operations during shut down

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/librbd/ExclusiveLock.cc
src/librbd/ImageWatcher.cc
src/librbd/image/RefreshRequest.cc
src/test/librbd/image/test_mock_RefreshRequest.cc

Simple merge
Simple merge
Simple merge