]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #19424 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 20 Dec 2017 01:08:09 +0000 (17:08 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 20 Dec 2017 01:08:09 +0000 (17:08 -0800)
* refs/pull/19424/head:
osdc/Journaler: introduce STATE_STOPPING state
osdc/Journaler: add 'stopping' check to various finish callbacks

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/osdc/Journaler.cc

Simple merge