Merge pull request #261 from ceph/wip-leveldb

author Sage Weil <sage@inktank.com>

Wed, 8 May 2013 18:01:51 +0000 (11:01 -0700)

committer Sage Weil <sage@inktank.com>

Wed, 8 May 2013 18:01:51 +0000 (11:01 -0700)
author Sage Weil <sage@inktank.com>
Wed, 8 May 2013 18:01:51 +0000 (11:01 -0700)
committer Sage Weil <sage@inktank.com>
Wed, 8 May 2013 18:01:51 +0000 (11:01 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/FileStore.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Wed, 8 May 2013 18:01:51 +0000 (11:01 -0700)
committer	Sage Weil <sage@inktank.com>
	Wed, 8 May 2013 18:01:51 +0000 (11:01 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history