]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit61ba2d7b6688e25ebb72988516786182ef383e87
tree3e6cd9a4433521b61bff81df1d4e3ae7ee30693f
parentfd5a82e3cd9c5a75f0ea9d21f51be7b4c13f7864
parent3a62d166a7af5a62d5210417a5c10f101ce75229
Merge PR #31677 into master

* 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>
src/common/legacy_config_opts.h
src/common/options.cc
src/osd/OSD.cc
src/vstart.sh