Merge pull request #15318 from tchaikov/wip-20067

author Sage Weil <sage@newdream.net>

Wed, 31 May 2017 23:09:06 +0000 (18:09 -0500)

committer GitHub <noreply@github.com>

Wed, 31 May 2017 23:09:06 +0000 (18:09 -0500)
author Sage Weil <sage@newdream.net>
Wed, 31 May 2017 23:09:06 +0000 (18:09 -0500)
committer GitHub <noreply@github.com>
Wed, 31 May 2017 23:09:06 +0000 (18:09 -0500)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 31 May 2017 23:09:06 +0000 (18:09 -0500)
committer	GitHub <noreply@github.com>
	Wed, 31 May 2017 23:09:06 +0000 (18:09 -0500)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history