Merge pull request #37546 from myoungwon/wip-revamp-tier-flush

author Samuel Just <sjust@redhat.com>

Fri, 4 Dec 2020 21:39:41 +0000 (13:39 -0800)

committer GitHub <noreply@github.com>

Fri, 4 Dec 2020 21:39:41 +0000 (13:39 -0800)
author Samuel Just <sjust@redhat.com>
Fri, 4 Dec 2020 21:39:41 +0000 (13:39 -0800)
committer GitHub <noreply@github.com>
Fri, 4 Dec 2020 21:39:41 +0000 (13:39 -0800)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Samuel Just <sjust@redhat.com>
	Fri, 4 Dec 2020 21:39:41 +0000 (13:39 -0800)
committer	GitHub <noreply@github.com>
	Fri, 4 Dec 2020 21:39:41 +0000 (13:39 -0800)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history