Merge pull request #32099 from hjwsm1989/wip-cancel-invalid-upmap-2

author Xie Xingguo <xie.xingguo@zte.com.cn>

Thu, 12 Dec 2019 03:11:34 +0000 (11:11 +0800)

committer GitHub <noreply@github.com>

Thu, 12 Dec 2019 03:11:34 +0000 (11:11 +0800)
author Xie Xingguo <xie.xingguo@zte.com.cn>
Thu, 12 Dec 2019 03:11:34 +0000 (11:11 +0800)
committer GitHub <noreply@github.com>
Thu, 12 Dec 2019 03:11:34 +0000 (11:11 +0800)
diff --cc src/crush/CrushWrapper.cc
Simple merge
diff --cc src/test/osd/TestOSDMap.cc
Simple merge
author	Xie Xingguo <xie.xingguo@zte.com.cn>
	Thu, 12 Dec 2019 03:11:34 +0000 (11:11 +0800)
committer	GitHub <noreply@github.com>
	Thu, 12 Dec 2019 03:11:34 +0000 (11:11 +0800)
		1	2
src/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/osd/TestOSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history