Merge pull request #326 from dalgaaf/wip-da-CID-727978

author Sage Weil <sage@inktank.com>

Tue, 28 May 2013 22:48:11 +0000 (15:48 -0700)

committer Sage Weil <sage@inktank.com>

Tue, 28 May 2013 22:48:11 +0000 (15:48 -0700)
author Sage Weil <sage@inktank.com>
Tue, 28 May 2013 22:48:11 +0000 (15:48 -0700)
committer Sage Weil <sage@inktank.com>
Tue, 28 May 2013 22:48:11 +0000 (15:48 -0700)
diff --cc src/key_value_store/kv_flat_btree_async.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Tue, 28 May 2013 22:48:11 +0000 (15:48 -0700)
committer	Sage Weil <sage@inktank.com>
	Tue, 28 May 2013 22:48:11 +0000 (15:48 -0700)