Merge pull request #20009 from Liuchang0812/fix-22727

author Kefu Chai <tchaikov@gmail.com>

Fri, 26 Jan 2018 07:30:11 +0000 (15:30 +0800)

committer GitHub <noreply@github.com>

Fri, 26 Jan 2018 07:30:11 +0000 (15:30 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 26 Jan 2018 07:30:11 +0000 (15:30 +0800)
committer GitHub <noreply@github.com>
Fri, 26 Jan 2018 07:30:11 +0000 (15:30 +0800)
diff --cc src/mon/PGMap.cc
Simple merge
diff --cc src/mon/PGMap.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 26 Jan 2018 07:30:11 +0000 (15:30 +0800)
committer	GitHub <noreply@github.com>
	Fri, 26 Jan 2018 07:30:11 +0000 (15:30 +0800)
		1	2
src/mon/PGMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMap.h	patch \|	diff1 \|	diff2 \|	blob \| history