From: Sage Weil <sage@redhat.com>
Date: Sat, 29 Feb 2020 22:13:07 +0000 (-0600)
Subject: Merge PR #33634 into master
X-Git-Tag: v15.1.1~195
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2f738184ab48971ec666c1a02423d721fc0c0c3;p=ceph.git

Merge PR #33634 into master

* refs/pull/33634/head:
	qa/workunits/cephadm/test_cephadm.sh: dump logs on exit
	qa/workunits/cephadm/test_cephadm.sh: add `cleanup` function

Reviewed-by: Sage Weil <sage@redhat.com>
---

f2f738184ab48971ec666c1a02423d721fc0c0c3