Merge pull request #29262 from smithfarm/wip-39748-mimic

author Yuri Weinstein <yweinste@redhat.com>

Tue, 6 Aug 2019 21:18:55 +0000 (14:18 -0700)

committer GitHub <noreply@github.com>

Tue, 6 Aug 2019 21:18:55 +0000 (14:18 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 6 Aug 2019 21:18:55 +0000 (14:18 -0700)
committer GitHub <noreply@github.com>
Tue, 6 Aug 2019 21:18:55 +0000 (14:18 -0700)
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 6 Aug 2019 21:18:55 +0000 (14:18 -0700)
committer	GitHub <noreply@github.com>
	Tue, 6 Aug 2019 21:18:55 +0000 (14:18 -0700)
		1	2
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history