From: Sage Weil <sage@redhat.com>
Date: Mon, 11 Mar 2019 17:37:06 +0000 (-0500)
Subject: Merge PR #26888 into master
X-Git-Tag: v14.2.0~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f83fb9aebd76bf5c7d125168f086e55fff096fb3;p=ceph.git

Merge PR #26888 into master

* refs/pull/26888/head:
	doc/releases/nautilus: add 'ceph-volume simple scan' to upgrade instructions

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
---

f83fb9aebd76bf5c7d125168f086e55fff096fb3
diff --cc .githubmap
index 253e5a11ecb9,253e5a11ecb9..601854cddc74
--- a/.githubmap
+++ b/.githubmap
@@@ -94,3 -94,3 +94,4 @@@ Yan-waller yanjun <yan.jun8@zte.com.cn
  b-ranto Boris Ranto <branto@redhat.com>
  yuvalif Yuval Lifshitz <ylifshit@redhat.com>
  mikechristie Mike Christie <mchristi@redhat.com>
++andrewschoen Andrew Schoen <aschoen@redhat.com>