Merge pull request #15120 from liewegas/wip-ec-buffer

author Sage Weil <sage@newdream.net>

Thu, 18 May 2017 18:28:02 +0000 (13:28 -0500)

committer GitHub <noreply@github.com>

Thu, 18 May 2017 18:28:02 +0000 (13:28 -0500)
author Sage Weil <sage@newdream.net>
Thu, 18 May 2017 18:28:02 +0000 (13:28 -0500)
committer GitHub <noreply@github.com>
Thu, 18 May 2017 18:28:02 +0000 (13:28 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 18 May 2017 18:28:02 +0000 (13:28 -0500)
committer	GitHub <noreply@github.com>
	Thu, 18 May 2017 18:28:02 +0000 (13:28 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history