Merge pull request #13407 from liewegas/wip-osd-msgs

author Sage Weil <sage@newdream.net>

Thu, 16 Feb 2017 03:50:55 +0000 (21:50 -0600)

committer GitHub <noreply@github.com>

Thu, 16 Feb 2017 03:50:55 +0000 (21:50 -0600)
author Sage Weil <sage@newdream.net>
Thu, 16 Feb 2017 03:50:55 +0000 (21:50 -0600)
committer GitHub <noreply@github.com>
Thu, 16 Feb 2017 03:50:55 +0000 (21:50 -0600)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 16 Feb 2017 03:50:55 +0000 (21:50 -0600)
committer	GitHub <noreply@github.com>
	Thu, 16 Feb 2017 03:50:55 +0000 (21:50 -0600)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history