Merge pull request #32069 from smithfarm/wip-42999-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Wed, 22 Jan 2020 16:33:27 +0000 (08:33 -0800)

committer GitHub <noreply@github.com>

Wed, 22 Jan 2020 16:33:27 +0000 (08:33 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 22 Jan 2020 16:33:27 +0000 (08:33 -0800)
committer GitHub <noreply@github.com>
Wed, 22 Jan 2020 16:33:27 +0000 (08:33 -0800)
diff --cc doc/rados/configuration/pool-pg-config-ref.rst
Simple merge
diff --cc src/common/options.cc
Simple merge
diff --cc src/pybind/mgr/pg_autoscaler/module.py
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 22 Jan 2020 16:33:27 +0000 (08:33 -0800)
committer	GitHub <noreply@github.com>
	Wed, 22 Jan 2020 16:33:27 +0000 (08:33 -0800)
		1	2
doc/rados/configuration/pool-pg-config-ref.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/pg_autoscaler/module.py	patch \|	diff1 \|	diff2 \|	blob \| history