Merge pull request #13019 from wonzhq/wip-long-io

author Sage Weil <sage@newdream.net>

Fri, 21 Apr 2017 17:22:51 +0000 (12:22 -0500)

committer GitHub <noreply@github.com>

Fri, 21 Apr 2017 17:22:51 +0000 (12:22 -0500)
author Sage Weil <sage@newdream.net>
Fri, 21 Apr 2017 17:22:51 +0000 (12:22 -0500)
committer GitHub <noreply@github.com>
Fri, 21 Apr 2017 17:22:51 +0000 (12:22 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 21 Apr 2017 17:22:51 +0000 (12:22 -0500)
committer	GitHub <noreply@github.com>
	Fri, 21 Apr 2017 17:22:51 +0000 (12:22 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history