Merge pull request #37431 from sseshasa/wip-handle-future-sched-ops

author Sridhar Seshasayee <sseshasa@redhat.com>

Sat, 24 Oct 2020 07:52:01 +0000 (13:22 +0530)

committer GitHub <noreply@github.com>

Sat, 24 Oct 2020 07:52:01 +0000 (13:22 +0530)
author Sridhar Seshasayee <sseshasa@redhat.com>
Sat, 24 Oct 2020 07:52:01 +0000 (13:22 +0530)
committer GitHub <noreply@github.com>
Sat, 24 Oct 2020 07:52:01 +0000 (13:22 +0530)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sridhar Seshasayee <sseshasa@redhat.com>
	Sat, 24 Oct 2020 07:52:01 +0000 (13:22 +0530)
committer	GitHub <noreply@github.com>
	Sat, 24 Oct 2020 07:52:01 +0000 (13:22 +0530)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history