Merge pull request #12938 from LiumxNL/fix-process-osd-failure

author Kefu Chai <tchaikov@gmail.com>

Mon, 23 Jan 2017 12:07:35 +0000 (20:07 +0800)

committer GitHub <noreply@github.com>

Mon, 23 Jan 2017 12:07:35 +0000 (20:07 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 23 Jan 2017 12:07:35 +0000 (20:07 +0800)
committer GitHub <noreply@github.com>
Mon, 23 Jan 2017 12:07:35 +0000 (20:07 +0800)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 23 Jan 2017 12:07:35 +0000 (20:07 +0800)
committer	GitHub <noreply@github.com>
	Mon, 23 Jan 2017 12:07:35 +0000 (20:07 +0800)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history