Merge pull request #4000 from ceph/wip-da-SCA-20150312

author Kefu Chai <tchaikov@gmail.com>

Wed, 25 Mar 2015 16:12:35 +0000 (00:12 +0800)

committer Kefu Chai <tchaikov@gmail.com>

Wed, 25 Mar 2015 16:12:35 +0000 (00:12 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 25 Mar 2015 16:12:35 +0000 (00:12 +0800)
committer Kefu Chai <tchaikov@gmail.com>
Wed, 25 Mar 2015 16:12:35 +0000 (00:12 +0800)
diff --cc src/key_value_store/kv_flat_btree_async.h
Simple merge
diff --cc src/test/librbd/test_librbd.cc
Simple merge
diff --cc src/test/msgr/test_async_driver.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 25 Mar 2015 16:12:35 +0000 (00:12 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Wed, 25 Mar 2015 16:12:35 +0000 (00:12 +0800)
		1	2
src/key_value_store/kv_flat_btree_async.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librbd/test_librbd.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/msgr/test_async_driver.cc	patch \|	diff1 \|	diff2 \|	blob \| history