Merge pull request #5114 from branch-predictor/bp-reduced-memzero

author Kefu Chai <tchaikov@gmail.com>

Fri, 28 Aug 2015 02:08:56 +0000 (10:08 +0800)

committer Kefu Chai <tchaikov@gmail.com>

Fri, 28 Aug 2015 02:08:56 +0000 (10:08 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 28 Aug 2015 02:08:56 +0000 (10:08 +0800)
committer Kefu Chai <tchaikov@gmail.com>
Fri, 28 Aug 2015 02:08:56 +0000 (10:08 +0800)
diff --cc src/os/FileJournal.cc
Simple merge
diff --cc src/os/ObjectStore.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 28 Aug 2015 02:08:56 +0000 (10:08 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Fri, 28 Aug 2015 02:08:56 +0000 (10:08 +0800)
		1	2
src/os/FileJournal.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/ObjectStore.h	patch \|	diff1 \|	diff2 \|	blob \| history