Merge pull request #27854 from smithfarm/wip-39504-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Fri, 10 May 2019 15:18:47 +0000 (08:18 -0700)

committer GitHub <noreply@github.com>

Fri, 10 May 2019 15:18:47 +0000 (08:18 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 10 May 2019 15:18:47 +0000 (08:18 -0700)
committer GitHub <noreply@github.com>
Fri, 10 May 2019 15:18:47 +0000 (08:18 -0700)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 10 May 2019 15:18:47 +0000 (08:18 -0700)
committer	GitHub <noreply@github.com>
	Fri, 10 May 2019 15:18:47 +0000 (08:18 -0700)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history