From: Sage Weil <sage@redhat.com>
Date: Tue, 19 Mar 2019 10:38:11 +0000 (-0500)
Subject: Merge PR #27019 into master
X-Git-Tag: v15.0.0~210
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2203c4d07ae2749349c78442869f1baeb2551fe4;p=ceph-ci.git

Merge PR #27019 into master

* refs/pull/27019/head:
	doc/releases/nautilus: add reference to msgr2 config update section
	doc/cephfs/nfs: update ceph.conf example
	doc/releases/nautilus: final upgrade note updates

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

2203c4d07ae2749349c78442869f1baeb2551fe4