]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #28941 into master
authorSage Weil <sage@redhat.com>
Wed, 10 Jul 2019 01:52:19 +0000 (20:52 -0500)
committerSage Weil <sage@redhat.com>
Wed, 10 Jul 2019 01:52:19 +0000 (20:52 -0500)
* refs/pull/28941/head:
osd: scrub_purged_snaps: fix log message tense
osd/SnapMapper: reset iterators at finish of run()
osd/SnapMapper: drop useless _init()
osd: do not hold osd_lock while queueing stray purged_snaps
osd: more debug output during scrub hang

Reviewed-by: Neha Ojha <nojha@redhat.com>

Trivial merge