Merge remote-tracking branch 'gh/nautilus'

author Sage Weil <sage@redhat.com>

Mon, 18 Mar 2019 17:10:50 +0000 (12:10 -0500)

committer Sage Weil <sage@redhat.com>

Mon, 18 Mar 2019 17:10:50 +0000 (12:10 -0500)
author Sage Weil <sage@redhat.com>
Mon, 18 Mar 2019 17:10:50 +0000 (12:10 -0500)
committer Sage Weil <sage@redhat.com>
Mon, 18 Mar 2019 17:10:50 +0000 (12:10 -0500)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 18 Mar 2019 17:10:50 +0000 (12:10 -0500)
committer	Sage Weil <sage@redhat.com>
	Mon, 18 Mar 2019 17:10:50 +0000 (12:10 -0500)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history