Merge pull request #20653 from xiexingguo/wip-fix-upmap

author Kefu Chai <tchaikov@gmail.com>

Fri, 2 Mar 2018 01:01:06 +0000 (09:01 +0800)

committer GitHub <noreply@github.com>

Fri, 2 Mar 2018 01:01:06 +0000 (09:01 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 2 Mar 2018 01:01:06 +0000 (09:01 +0800)
committer GitHub <noreply@github.com>
Fri, 2 Mar 2018 01:01:06 +0000 (09:01 +0800)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 2 Mar 2018 01:01:06 +0000 (09:01 +0800)
committer	GitHub <noreply@github.com>
	Fri, 2 Mar 2018 01:01:06 +0000 (09:01 +0800)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history