From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 20 Dec 2017 01:08:09 +0000 (-0800)
Subject: Merge PR #19424 into master
X-Git-Tag: v13.0.2~730
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=64430227100e1fd67daee76df4c95a23763aad61;p=ceph.git

Merge PR #19424 into master

* 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>
---

64430227100e1fd67daee76df4c95a23763aad61