]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #9440 from dillaman/wip-16114
authorMykola Golub <to.my.trociny@gmail.com>
Wed, 8 Jun 2016 15:21:16 +0000 (18:21 +0300)
committerMykola Golub <to.my.trociny@gmail.com>
Wed, 8 Jun 2016 15:21:16 +0000 (18:21 +0300)
librbd: prevent error messages when journal externally disabled

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
1  2 
src/librbd/internal.cc
src/osdc/ObjectCacher.h
src/test/librbd/exclusive_lock/test_mock_AcquireRequest.cc

Simple merge
Simple merge