Merge pull request #29391 from pdvian/wip-40625-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Fri, 2 Aug 2019 20:10:59 +0000 (13:10 -0700)

committer GitHub <noreply@github.com>

Fri, 2 Aug 2019 20:10:59 +0000 (13:10 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 2 Aug 2019 20:10:59 +0000 (13:10 -0700)
committer GitHub <noreply@github.com>
Fri, 2 Aug 2019 20:10:59 +0000 (13:10 -0700)
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 2 Aug 2019 20:10:59 +0000 (13:10 -0700)
committer	GitHub <noreply@github.com>
	Fri, 2 Aug 2019 20:10:59 +0000 (13:10 -0700)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history