]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33601 into master
authorSage Weil <sage@redhat.com>
Mon, 2 Mar 2020 20:27:58 +0000 (14:27 -0600)
committerSage Weil <sage@redhat.com>
Mon, 2 Mar 2020 20:27:58 +0000 (14:27 -0600)
* refs/pull/33601/head:
qa/tasks/thrashosds-health: disable osd_max_markdown behavior
osd: derr on do_shutdown cases

Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/osd/OSD.cc

diff --cc src/osd/OSD.cc
Simple merge