Merge pull request #20829 from xiexingguo/backport-pr-20653

author Yuri Weinstein <yweinste@redhat.com>

Wed, 11 Apr 2018 19:52:23 +0000 (12:52 -0700)

committer GitHub <noreply@github.com>

Wed, 11 Apr 2018 19:52:23 +0000 (12:52 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 11 Apr 2018 19:52:23 +0000 (12:52 -0700)
committer GitHub <noreply@github.com>
Wed, 11 Apr 2018 19:52:23 +0000 (12:52 -0700)
diff --cc src/crush/CrushWrapper.cc
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 11 Apr 2018 19:52:23 +0000 (12:52 -0700)
committer	GitHub <noreply@github.com>
	Wed, 11 Apr 2018 19:52:23 +0000 (12:52 -0700)
		1	2
src/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history