Merge pull request #11993 from ceph/wip-17809

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

Mon, 21 Nov 2016 21:37:17 +0000 (13:37 -0800)

committer GitHub <noreply@github.com>

Mon, 21 Nov 2016 21:37:17 +0000 (13:37 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Mon, 21 Nov 2016 21:37:17 +0000 (13:37 -0800)
committer GitHub <noreply@github.com>
Mon, 21 Nov 2016 21:37:17 +0000 (13:37 -0800)
diff --cc src/common/buffer.cc
Simple merge
diff --cc src/include/buffer.h
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Mon, 21 Nov 2016 21:37:17 +0000 (13:37 -0800)
committer	GitHub <noreply@github.com>
	Mon, 21 Nov 2016 21:37:17 +0000 (13:37 -0800)
		1	2
src/common/buffer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/buffer.h	patch \|	diff1 \|	diff2 \|	blob \| history