Merge pull request #18248 from ivancich/wip-rgw-unify-bi-hash-calc

author Yuri Weinstein <yuri.weinstein@gmail.com>

Fri, 13 Oct 2017 19:50:59 +0000 (12:50 -0700)

committer GitHub <noreply@github.com>

Fri, 13 Oct 2017 19:50:59 +0000 (12:50 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Fri, 13 Oct 2017 19:50:59 +0000 (12:50 -0700)
committer GitHub <noreply@github.com>
Fri, 13 Oct 2017 19:50:59 +0000 (12:50 -0700)
diff --cc src/rgw/rgw_gc.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Fri, 13 Oct 2017 19:50:59 +0000 (12:50 -0700)
committer	GitHub <noreply@github.com>
	Fri, 13 Oct 2017 19:50:59 +0000 (12:50 -0700)
		1	2
src/rgw/rgw_gc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history