Merge PR #25598 into master

author Sage Weil <sage@redhat.com>

Thu, 20 Dec 2018 12:48:24 +0000 (06:48 -0600)

committer Sage Weil <sage@redhat.com>

Thu, 20 Dec 2018 12:48:24 +0000 (06:48 -0600)
author Sage Weil <sage@redhat.com>
Thu, 20 Dec 2018 12:48:24 +0000 (06:48 -0600)
committer Sage Weil <sage@redhat.com>
Thu, 20 Dec 2018 12:48:24 +0000 (06:48 -0600)
diff --cc src/common/buffer.cc
Simple merge
diff --cc src/include/buffer.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 20 Dec 2018 12:48:24 +0000 (06:48 -0600)
committer	Sage Weil <sage@redhat.com>
	Thu, 20 Dec 2018 12:48:24 +0000 (06:48 -0600)
		1	2
src/common/buffer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/buffer.h	patch \|	diff1 \|	diff2 \|	blob \| history