From: Sage Weil <sage@redhat.com>
Date: Thu, 13 Feb 2020 01:09:05 +0000 (-0600)
Subject: Merge PR #33216 into master
X-Git-Tag: v15.1.1~448
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=81bad666e0f39294fc253d4506ba9ec7c9d672cc;p=ceph.git

Merge PR #33216 into master

* refs/pull/33216/head:
	cephadm: avoid trigger old podman bug
	qa/workunits/cephadm/test_cephadm.sh: wait longer for grafana

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

81bad666e0f39294fc253d4506ba9ec7c9d672cc