From: Sage Weil <sage@redhat.com>
Date: Fri, 20 Mar 2020 19:50:42 +0000 (-0500)
Subject: Merge PR #34046 into octopus
X-Git-Tag: v15.2.0~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1bc2853d2fe9e191bcfbf4449b4b04b477a3e737;p=ceph.git

Merge PR #34046 into octopus

* refs/pull/34046/head:
	qa/suites/rados/cephadm/upgrade: update starting version
	mgr/orch: 'ceph upgrade ...' -> 'ceph orch upgrade ...'

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

1bc2853d2fe9e191bcfbf4449b4b04b477a3e737