Merge pull request #3123 from linuxbox2/wip-claim-3

author Samuel Just <sam.just@inktank.com>

Thu, 18 Dec 2014 19:23:23 +0000 (11:23 -0800)

committer Samuel Just <sam.just@inktank.com>

Thu, 18 Dec 2014 19:23:23 +0000 (11:23 -0800)
author Samuel Just <sam.just@inktank.com>
Thu, 18 Dec 2014 19:23:23 +0000 (11:23 -0800)
committer Samuel Just <sam.just@inktank.com>
Thu, 18 Dec 2014 19:23:23 +0000 (11:23 -0800)
diff --cc src/include/buffer.h
Simple merge
diff --cc src/os/FileJournal.cc
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Thu, 18 Dec 2014 19:23:23 +0000 (11:23 -0800)
committer	Samuel Just <sam.just@inktank.com>
	Thu, 18 Dec 2014 19:23:23 +0000 (11:23 -0800)
		1	2
src/include/buffer.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileJournal.cc	patch \|	diff1 \|	diff2 \|	blob \| history