Merge pull request #5810 from Abhishekvrshny/wip-12948-hammer

author Loic Dachary <loic@dachary.org>

Mon, 9 Nov 2015 07:38:31 +0000 (08:38 +0100)

committer Loic Dachary <loic@dachary.org>

Mon, 9 Nov 2015 07:38:31 +0000 (08:38 +0100)
author Loic Dachary <loic@dachary.org>
Mon, 9 Nov 2015 07:38:31 +0000 (08:38 +0100)
committer Loic Dachary <loic@dachary.org>
Mon, 9 Nov 2015 07:38:31 +0000 (08:38 +0100)
diff --cc src/common/buffer.cc
Simple merge
diff --cc src/test/bufferlist.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Mon, 9 Nov 2015 07:38:31 +0000 (08:38 +0100)
committer	Loic Dachary <loic@dachary.org>
	Mon, 9 Nov 2015 07:38:31 +0000 (08:38 +0100)
		1	2
src/common/buffer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/bufferlist.cc	patch \|	diff1 \|	diff2 \|	blob \| history