]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #45654 from ljflores/wip-pacific-fast-shutdown-backports
authorYuri Weinstein <yweinste@redhat.com>
Mon, 4 Apr 2022 21:50:43 +0000 (14:50 -0700)
committerGitHub <noreply@github.com>
Mon, 4 Apr 2022 21:50:43 +0000 (14:50 -0700)
Pacific fast shutdown backports

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>
Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
1  2 
src/common/options.cc
src/mon/OSDMonitor.cc
src/osd/OSD.cc

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