Merge pull request #13206 from liewegas/wip-osd-enxio

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

Fri, 3 Feb 2017 16:43:08 +0000 (08:43 -0800)

committer GitHub <noreply@github.com>

Fri, 3 Feb 2017 16:43:08 +0000 (08:43 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Fri, 3 Feb 2017 16:43:08 +0000 (08:43 -0800)
committer GitHub <noreply@github.com>
Fri, 3 Feb 2017 16:43:08 +0000 (08:43 -0800)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Fri, 3 Feb 2017 16:43:08 +0000 (08:43 -0800)
committer	GitHub <noreply@github.com>
	Fri, 3 Feb 2017 16:43:08 +0000 (08:43 -0800)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history