From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 7 Jun 2018 13:06:56 +0000 (-0700)
Subject: Merge PR #22445 into master
X-Git-Tag: v14.0.1~1166
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84860eff46d07eed36d9e92937e39e34fc760215;p=ceph.git

Merge PR #22445 into master

* refs/pull/22445/head:
	doc: fix release notes on snapshot upgrades

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
---

84860eff46d07eed36d9e92937e39e34fc760215