Merge pull request #9502 from tchaikov/wip-buffer-noexcept

author Kefu Chai <tchaikov@gmail.com>

Mon, 13 Jun 2016 13:49:41 +0000 (21:49 +0800)

committer GitHub <noreply@github.com>

Mon, 13 Jun 2016 13:49:41 +0000 (21:49 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 13 Jun 2016 13:49:41 +0000 (21:49 +0800)
committer GitHub <noreply@github.com>
Mon, 13 Jun 2016 13:49:41 +0000 (21:49 +0800)
diff --cc src/common/buffer.cc
Simple merge
diff --cc src/include/buffer.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 13 Jun 2016 13:49:41 +0000 (21:49 +0800)
committer	GitHub <noreply@github.com>
	Mon, 13 Jun 2016 13:49:41 +0000 (21:49 +0800)
		1	2
src/common/buffer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/buffer.h	patch \|	diff1 \|	diff2 \|	blob \| history