From: Sage Weil <sage@redhat.com>
Date: Tue, 16 Apr 2019 19:30:23 +0000 (-0500)
Subject: Merge PR #27568 into master
X-Git-Tag: v15.1.0~2920
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ca140a50010957c6b2aab21dabeb44783ace9fa6;p=ceph.git

Merge PR #27568 into master

* refs/pull/27568/head:
	doc/release/nautilus: proscribe minimum hammer tunables and straw2 on upgrade
	common/options: update mon_crush_min_required_version=hammer

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

ca140a50010957c6b2aab21dabeb44783ace9fa6