]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #36777 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 31 Aug 2020 20:21:14 +0000 (13:21 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 31 Aug 2020 20:21:14 +0000 (13:21 -0700)
* refs/pull/36777/head:
osdc/Journaler: do not call onsafe->complete() if onsafe is 0

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

Simple merge