Merge pull request #5656 from XinzeChi/wip-buffer-emtpyptr

author Sage Weil <sage@redhat.com>

Fri, 28 Aug 2015 16:12:45 +0000 (12:12 -0400)

committer Sage Weil <sage@redhat.com>

Fri, 28 Aug 2015 16:12:45 +0000 (12:12 -0400)
author Sage Weil <sage@redhat.com>
Fri, 28 Aug 2015 16:12:45 +0000 (12:12 -0400)
committer Sage Weil <sage@redhat.com>
Fri, 28 Aug 2015 16:12:45 +0000 (12:12 -0400)
diff --cc src/common/buffer.cc
Simple merge
diff --cc src/test/bufferlist.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 28 Aug 2015 16:12:45 +0000 (12:12 -0400)
committer	Sage Weil <sage@redhat.com>
	Fri, 28 Aug 2015 16:12:45 +0000 (12:12 -0400)
		1	2
src/common/buffer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/bufferlist.cc	patch \|	diff1 \|	diff2 \|	blob \| history