Merge pull request #29949 from smithfarm/wip-41282-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Sat, 16 Nov 2019 15:52:47 +0000 (07:52 -0800)

committer GitHub <noreply@github.com>

Sat, 16 Nov 2019 15:52:47 +0000 (07:52 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Sat, 16 Nov 2019 15:52:47 +0000 (07:52 -0800)
committer GitHub <noreply@github.com>
Sat, 16 Nov 2019 15:52:47 +0000 (07:52 -0800)
diff --cc doc/rados/operations/health-checks.rst
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Sat, 16 Nov 2019 15:52:47 +0000 (07:52 -0800)
committer	GitHub <noreply@github.com>
	Sat, 16 Nov 2019 15:52:47 +0000 (07:52 -0800)
		1	2
doc/rados/operations/health-checks.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history