Merge pull request #27645 from ifed01/wip-ifed-legacy-statfs-alert-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Tue, 4 Jun 2019 20:47:14 +0000 (13:47 -0700)

committer GitHub <noreply@github.com>

Tue, 4 Jun 2019 20:47:14 +0000 (13:47 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 4 Jun 2019 20:47:14 +0000 (13:47 -0700)
committer GitHub <noreply@github.com>
Tue, 4 Jun 2019 20:47:14 +0000 (13:47 -0700)
diff --cc doc/rados/operations/health-checks.rst
Simple merge
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
diff --cc src/mon/PGMap.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 4 Jun 2019 20:47:14 +0000 (13:47 -0700)
committer	GitHub <noreply@github.com>
	Tue, 4 Jun 2019 20:47:14 +0000 (13:47 -0700)
		1	2
doc/rados/operations/health-checks.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history