Merge pull request #27625 from liewegas/wip-min-crush-hammer-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Fri, 7 Jun 2019 00:08:46 +0000 (17:08 -0700)

committer GitHub <noreply@github.com>

Fri, 7 Jun 2019 00:08:46 +0000 (17:08 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 7 Jun 2019 00:08:46 +0000 (17:08 -0700)
committer GitHub <noreply@github.com>
Fri, 7 Jun 2019 00:08:46 +0000 (17:08 -0700)
diff --cc doc/releases/nautilus.rst
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 7 Jun 2019 00:08:46 +0000 (17:08 -0700)
committer	GitHub <noreply@github.com>
	Fri, 7 Jun 2019 00:08:46 +0000 (17:08 -0700)
		1	2
doc/releases/nautilus.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history