]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 957c8a0 fd17368)
Merge PR #33132 into master
authorSage Weil <sage@redhat.com>
Sat, 8 Feb 2020 13:27:27 +0000 (07:27 -0600)
committerSage Weil <sage@redhat.com>
Sat, 8 Feb 2020 13:27:27 +0000 (07:27 -0600)
* 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 <mfritch@suse.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.