Merge pull request #16078 from xiexingguo/wip-misc

author Yuri Weinstein <yuri.weinstein@gmail.com>

Fri, 7 Jul 2017 22:15:58 +0000 (15:15 -0700)

committer GitHub <noreply@github.com>

Fri, 7 Jul 2017 22:15:58 +0000 (15:15 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Fri, 7 Jul 2017 22:15:58 +0000 (15:15 -0700)
committer GitHub <noreply@github.com>
Fri, 7 Jul 2017 22:15:58 +0000 (15:15 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Fri, 7 Jul 2017 22:15:58 +0000 (15:15 -0700)
committer	GitHub <noreply@github.com>
	Fri, 7 Jul 2017 22:15:58 +0000 (15:15 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history