]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #33544 into master
authorSage Weil <sage@redhat.com>
Wed, 26 Feb 2020 23:11:11 +0000 (17:11 -0600)
committerSage Weil <sage@redhat.com>
Wed, 26 Feb 2020 23:11:11 +0000 (17:11 -0600)
* 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>

Trivial merge