From: Sage Weil Date: Sat, 8 Feb 2020 13:27:27 +0000 (-0600) Subject: Merge PR #33132 into master X-Git-Tag: v15.1.1~504 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82c4bce2a12e81f8d4b377fddf358b55bef6b943;p=ceph.git Merge PR #33132 into master * refs/pull/33132/head: qa/workunits/cephadm/test_repos: apt update qa/workunits/cephadm/test_repos: fix subst qa/suites/rados/cephadm/.../test_repos: run without ulimit and coverage tools qa/tasks/workunit: accept coverage_and_limits: false qa/suites/rados/cephadm: move ubuntu_18.04_podman to shared location qa/suites/rados/cephadm: fix conflicts, missing .qa link Reviewed-by: Michael Fritch --- 82c4bce2a12e81f8d4b377fddf358b55bef6b943