Merge pull request #38920 from sunnyku/wip-ceph-mclock-op

author Neha Ojha <nojha@redhat.com>

Sun, 17 Jan 2021 02:24:13 +0000 (18:24 -0800)

committer GitHub <noreply@github.com>

Sun, 17 Jan 2021 02:24:13 +0000 (18:24 -0800)
author Neha Ojha <nojha@redhat.com>
Sun, 17 Jan 2021 02:24:13 +0000 (18:24 -0800)
committer GitHub <noreply@github.com>
Sun, 17 Jan 2021 02:24:13 +0000 (18:24 -0800)
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Neha Ojha <nojha@redhat.com>
	Sun, 17 Jan 2021 02:24:13 +0000 (18:24 -0800)
committer	GitHub <noreply@github.com>
	Sun, 17 Jan 2021 02:24:13 +0000 (18:24 -0800)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history