Merge pull request #325 from dalgaaf/wip-da-CID-727980

author Sage Weil <sage@inktank.com>

Tue, 28 May 2013 17:27:56 +0000 (10:27 -0700)

committer Sage Weil <sage@inktank.com>

Tue, 28 May 2013 17:27:56 +0000 (10:27 -0700)
author Sage Weil <sage@inktank.com>
Tue, 28 May 2013 17:27:56 +0000 (10:27 -0700)
committer Sage Weil <sage@inktank.com>
Tue, 28 May 2013 17:27:56 +0000 (10:27 -0700)
diff --cc src/key_value_store/kv_flat_btree_async.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Tue, 28 May 2013 17:27:56 +0000 (10:27 -0700)
committer	Sage Weil <sage@inktank.com>
	Tue, 28 May 2013 17:27:56 +0000 (10:27 -0700)