From: Sage Weil <sage@redhat.com>
Date: Wed, 26 Feb 2020 23:11:11 +0000 (-0600)
Subject: Merge PR #33544 into master
X-Git-Tag: v15.1.1~239
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ffaa19ac4ccac53353e5f481de61bfa3b5128f1e;p=ceph.git

Merge PR #33544 into master

* refs/pull/33544/head:
	qa/workunits/cephadm/test_cephadm.sh: remove image param non-ceph tests
	qa/workunits/cephadm/test_cephadm.sh: consolidate wait loop logic

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

ffaa19ac4ccac53353e5f481de61bfa3b5128f1e