Merge pull request #1999 from yuyuyu101/keyvaluestore-cache

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

Sat, 12 Jul 2014 00:01:12 +0000 (17:01 -0700)

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

Sat, 12 Jul 2014 00:01:12 +0000 (17:01 -0700)
author Samuel Just <sam.just@inktank.com>
Sat, 12 Jul 2014 00:01:12 +0000 (17:01 -0700)
committer Samuel Just <sam.just@inktank.com>
Sat, 12 Jul 2014 00:01:12 +0000 (17:01 -0700)
diff --cc src/common/Makefile.am
Simple merge
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/KeyValueStore.cc
Simple merge
diff --cc src/os/KeyValueStore.h
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Sat, 12 Jul 2014 00:01:12 +0000 (17:01 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Sat, 12 Jul 2014 00:01:12 +0000 (17:01 -0700)
		1	2
src/common/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/KeyValueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/KeyValueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history