Merge pull request #34835 from jschmid1/osdspec_affinity

author Kefu Chai <kchai@redhat.com>

Thu, 28 May 2020 07:00:22 +0000 (15:00 +0800)

committer GitHub <noreply@github.com>

Thu, 28 May 2020 07:00:22 +0000 (15:00 +0800)
author Kefu Chai <kchai@redhat.com>
Thu, 28 May 2020 07:00:22 +0000 (15:00 +0800)
committer GitHub <noreply@github.com>
Thu, 28 May 2020 07:00:22 +0000 (15:00 +0800)
diff --cc src/ceph_osd.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Thu, 28 May 2020 07:00:22 +0000 (15:00 +0800)
committer	GitHub <noreply@github.com>
	Thu, 28 May 2020 07:00:22 +0000 (15:00 +0800)
		1	2
src/ceph_osd.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history