]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #31677 into master
authorSage Weil <sage@redhat.com>
Mon, 25 Nov 2019 14:54:45 +0000 (08:54 -0600)
committerSage Weil <sage@redhat.com>
Mon, 25 Nov 2019 14:54:45 +0000 (08:54 -0600)
* refs/pull/31677/head:
qa/standalone/ceph-helpers.sh: remove osd down check
qa/standalone/ceph-helpers.sh: destroy_osd: mark osd down
osd: add osd_fast_shutdown option (default true)

Reviewed-by: Sébastien Han <seb@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/common/legacy_config_opts.h
src/common/options.cc
src/osd/OSD.cc
src/vstart.sh

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