Merge pull request #30195 from dzafman/wip-network-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Tue, 12 Nov 2019 23:40:47 +0000 (15:40 -0800)

committer GitHub <noreply@github.com>

Tue, 12 Nov 2019 23:40:47 +0000 (15:40 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 12 Nov 2019 23:40:47 +0000 (15:40 -0800)
committer GitHub <noreply@github.com>
Tue, 12 Nov 2019 23:40:47 +0000 (15:40 -0800)
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 12 Nov 2019 23:40:47 +0000 (15:40 -0800)
committer	GitHub <noreply@github.com>
	Tue, 12 Nov 2019 23:40:47 +0000 (15:40 -0800)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history