Merge pull request #4308 from dachary/wip-bencher

author Loic Dachary <loic@dachary.org>

Wed, 13 May 2015 21:00:05 +0000 (23:00 +0200)

committer Loic Dachary <loic@dachary.org>

Wed, 13 May 2015 21:00:05 +0000 (23:00 +0200)
author Loic Dachary <loic@dachary.org>
Wed, 13 May 2015 21:00:05 +0000 (23:00 +0200)
committer Loic Dachary <loic@dachary.org>
Wed, 13 May 2015 21:00:05 +0000 (23:00 +0200)
diff --cc src/common/obj_bencher.cc
Simple merge
diff --cc src/tools/rados/rados.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Wed, 13 May 2015 21:00:05 +0000 (23:00 +0200)
committer	Loic Dachary <loic@dachary.org>
	Wed, 13 May 2015 21:00:05 +0000 (23:00 +0200)
		1	2
src/common/obj_bencher.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rados/rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history