Merge pull request #14913 from liewegas/wip-19826

author Kefu Chai <tchaikov@gmail.com>

Wed, 3 May 2017 15:56:07 +0000 (23:56 +0800)

committer GitHub <noreply@github.com>

Wed, 3 May 2017 15:56:07 +0000 (23:56 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 3 May 2017 15:56:07 +0000 (23:56 +0800)
committer GitHub <noreply@github.com>
Wed, 3 May 2017 15:56:07 +0000 (23:56 +0800)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 3 May 2017 15:56:07 +0000 (23:56 +0800)
committer	GitHub <noreply@github.com>
	Wed, 3 May 2017 15:56:07 +0000 (23:56 +0800)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history