Merge pull request #1675 from guangyy/wip-bench

author Gregory Farnum <greg@inktank.com>

Thu, 17 Apr 2014 04:57:41 +0000 (21:57 -0700)

committer Gregory Farnum <greg@inktank.com>

Thu, 17 Apr 2014 04:57:41 +0000 (21:57 -0700)
author Gregory Farnum <greg@inktank.com>
Thu, 17 Apr 2014 04:57:41 +0000 (21:57 -0700)
committer Gregory Farnum <greg@inktank.com>
Thu, 17 Apr 2014 04:57:41 +0000 (21:57 -0700)
diff --cc src/common/obj_bencher.cc
Simple merge
diff --cc src/tools/rados/rados.cc
Simple merge
author	Gregory Farnum <greg@inktank.com>
	Thu, 17 Apr 2014 04:57:41 +0000 (21:57 -0700)
committer	Gregory Farnum <greg@inktank.com>
	Thu, 17 Apr 2014 04:57:41 +0000 (21:57 -0700)
		1	2
src/common/obj_bencher.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rados/rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history