Merge pull request #321 from dalgaaf/wip-da-CID-727981

author Sage Weil <sage@inktank.com>

Mon, 27 May 2013 20:55:54 +0000 (13:55 -0700)

committer Sage Weil <sage@inktank.com>

Mon, 27 May 2013 20:55:54 +0000 (13:55 -0700)
author Sage Weil <sage@inktank.com>
Mon, 27 May 2013 20:55:54 +0000 (13:55 -0700)
committer Sage Weil <sage@inktank.com>
Mon, 27 May 2013 20:55:54 +0000 (13:55 -0700)
diff --cc src/key_value_store/kv_flat_btree_async.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Mon, 27 May 2013 20:55:54 +0000 (13:55 -0700)
committer	Sage Weil <sage@inktank.com>
	Mon, 27 May 2013 20:55:54 +0000 (13:55 -0700)