Merge pull request #31001 from rosinL/wip-set-radosgw-cpu-affinity

author Daniel Gryniewicz <dang@redhat.com>

Mon, 17 Feb 2020 18:11:25 +0000 (13:11 -0500)

committer GitHub <noreply@github.com>

Mon, 17 Feb 2020 18:11:25 +0000 (13:11 -0500)
author Daniel Gryniewicz <dang@redhat.com>
Mon, 17 Feb 2020 18:11:25 +0000 (13:11 -0500)
committer GitHub <noreply@github.com>
Mon, 17 Feb 2020 18:11:25 +0000 (13:11 -0500)
diff --cc src/common/options.cc
Simple merge
diff --cc src/rgw/rgw_main.cc
Simple merge
author	Daniel Gryniewicz <dang@redhat.com>
	Mon, 17 Feb 2020 18:11:25 +0000 (13:11 -0500)
committer	GitHub <noreply@github.com>
	Mon, 17 Feb 2020 18:11:25 +0000 (13:11 -0500)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_main.cc	patch \|	diff1 \|	diff2 \|	blob \| history