Merge pull request #8555 from avnerbh/fixes_no_3

author Sage Weil <sage@redhat.com>

Fri, 15 Apr 2016 21:14:22 +0000 (17:14 -0400)

committer Sage Weil <sage@redhat.com>

Fri, 15 Apr 2016 21:14:22 +0000 (17:14 -0400)
author Sage Weil <sage@redhat.com>
Fri, 15 Apr 2016 21:14:22 +0000 (17:14 -0400)
committer Sage Weil <sage@redhat.com>
Fri, 15 Apr 2016 21:14:22 +0000 (17:14 -0400)
diff --cc src/common/buffer.cc
Simple merge
diff --cc src/msg/xio/XioConnection.cc
Simple merge
diff --cc src/msg/xio/XioMessenger.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 15 Apr 2016 21:14:22 +0000 (17:14 -0400)
committer	Sage Weil <sage@redhat.com>
	Fri, 15 Apr 2016 21:14:22 +0000 (17:14 -0400)
		1	2
src/common/buffer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/xio/XioConnection.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/xio/XioMessenger.cc	patch \|	diff1 \|	diff2 \|	blob \| history