Merge pull request #49417 from athanatos/sjust/backburner/wip-smp-option

author Samuel Just <sjust@redhat.com>

Fri, 13 Jan 2023 02:34:48 +0000 (18:34 -0800)

committer GitHub <noreply@github.com>

Fri, 13 Jan 2023 02:34:48 +0000 (18:34 -0800)
author Samuel Just <sjust@redhat.com>
Fri, 13 Jan 2023 02:34:48 +0000 (18:34 -0800)
committer GitHub <noreply@github.com>
Fri, 13 Jan 2023 02:34:48 +0000 (18:34 -0800)
diff --cc src/common/options/crimson.yaml.in
Simple merge
diff --cc src/crimson/osd/CMakeLists.txt
Simple merge
diff --cc src/vstart.sh
Simple merge
author	Samuel Just <sjust@redhat.com>
	Fri, 13 Jan 2023 02:34:48 +0000 (18:34 -0800)
committer	GitHub <noreply@github.com>
	Fri, 13 Jan 2023 02:34:48 +0000 (18:34 -0800)
		1	2
src/common/options/crimson.yaml.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/crimson/osd/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	patch \|	diff1 \|	diff2 \|	blob \| history