Merge pull request #43329 from cfsnyder/wip-48752-generalize-ops-log-socket

author Matt Benjamin <mbenjamin@redhat.com>

Fri, 29 Oct 2021 16:19:59 +0000 (12:19 -0400)

committer GitHub <noreply@github.com>

Fri, 29 Oct 2021 16:19:59 +0000 (12:19 -0400)
author Matt Benjamin <mbenjamin@redhat.com>
Fri, 29 Oct 2021 16:19:59 +0000 (12:19 -0400)
committer GitHub <noreply@github.com>
Fri, 29 Oct 2021 16:19:59 +0000 (12:19 -0400)
diff --cc src/common/options/rgw.yaml.in
Simple merge
diff --cc src/rgw/rgw_main.cc
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Fri, 29 Oct 2021 16:19:59 +0000 (12:19 -0400)
committer	GitHub <noreply@github.com>
	Fri, 29 Oct 2021 16:19:59 +0000 (12:19 -0400)
		1	2
src/common/options/rgw.yaml.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_main.cc	patch \|	diff1 \|	diff2 \|	blob \| history