From: Sage Weil <sage@redhat.com>
Date: Tue, 17 Mar 2020 19:52:28 +0000 (-0500)
Subject: Merge PR #33974 into octopus
X-Git-Tag: v15.2.0~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=126c4446ac03fa86fbcefe1e168dd0f210dc581a;p=ceph.git

Merge PR #33974 into octopus

* refs/pull/33974/head:
	use quay octopus tip until 15.2 tag is available
	update default container images

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

126c4446ac03fa86fbcefe1e168dd0f210dc581a