From: Sage Weil <sage@newdream.net>
Date: Mon, 18 Oct 2021 19:03:24 +0000 (-0400)
Subject: Merge PR #43510 into master
X-Git-Tag: v17.1.0~655
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a63e3eafd72e34570bd3104593b1332bdc8deea;p=ceph.git

Merge PR #43510 into master

* refs/pull/43510/head:
	qa/suites/orch/cephadm/upgrade: smoke test for 'orch upgrade ls'
	mgr/cephadm: make upgrade ls output structured
	mgr/cephadm: add 'orch upgrade ls' to list available versions

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
---

4a63e3eafd72e34570bd3104593b1332bdc8deea