From: Sage Weil <sage@redhat.com>
Date: Sat, 15 Feb 2020 01:52:57 +0000 (-0600)
Subject: Merge PR #33343 into master
X-Git-Tag: v15.1.1~411
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=838f513a85dd9a63dac9e916f4086de203646a3d;p=ceph.git

Merge PR #33343 into master

* refs/pull/33343/head:
	qa/suites/rados/cephadm/upgrade: add simple upgrade test
	qa/tasks/cephadm: improve shell subcommand

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

838f513a85dd9a63dac9e916f4086de203646a3d