Merge pull request #44807 from NitzanMordhai/wip-nitzan-fast-shutdown-notify-mon

author Yuri Weinstein <yweinste@redhat.com>

Fri, 25 Mar 2022 15:59:05 +0000 (08:59 -0700)

committer GitHub <noreply@github.com>

Fri, 25 Mar 2022 15:59:05 +0000 (08:59 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 25 Mar 2022 15:59:05 +0000 (08:59 -0700)
committer GitHub <noreply@github.com>
Fri, 25 Mar 2022 15:59:05 +0000 (08:59 -0700)
diff --cc src/common/options/global.yaml.in
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 25 Mar 2022 15:59:05 +0000 (08:59 -0700)
committer	GitHub <noreply@github.com>
	Fri, 25 Mar 2022 15:59:05 +0000 (08:59 -0700)
		1	2
src/common/options/global.yaml.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history