]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitc320bb2f72bca7abf97b1bd017c68cde0106efee
treeb73f81c0785ffca2168067b7a2829cc3826c3dc3
parentbaa99901b49c75c3694dbef199ae2e830a69f1ac
parent276fed6b7078158c2cd04fba14a11531c27898e0
Merge pull request #9440 from dillaman/wip-16114

librbd: prevent error messages when journal externally disabled

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