Merge pull request #38852 from adamemerson/wip-thou-shalt-not-unwind

author Harish Munjulur <harishmunjulur@gmail.com>

Mon, 25 Jan 2021 23:22:38 +0000 (15:22 -0800)

committer GitHub <noreply@github.com>

Mon, 25 Jan 2021 23:22:38 +0000 (15:22 -0800)
author Harish Munjulur <harishmunjulur@gmail.com>
Mon, 25 Jan 2021 23:22:38 +0000 (15:22 -0800)
committer GitHub <noreply@github.com>
Mon, 25 Jan 2021 23:22:38 +0000 (15:22 -0800)
diff --cc src/rgw/rgw_amqp.cc
Simple merge
diff --cc src/rgw/rgw_datalog.cc
Simple merge
author	Harish Munjulur <harishmunjulur@gmail.com>
	Mon, 25 Jan 2021 23:22:38 +0000 (15:22 -0800)
committer	GitHub <noreply@github.com>
	Mon, 25 Jan 2021 23:22:38 +0000 (15:22 -0800)
		1	2
src/rgw/rgw_amqp.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_datalog.cc	patch \|	diff1 \|	diff2 \|	blob \| history