]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #33133 into master
authorSage Weil <sage@redhat.com>
Sun, 9 Feb 2020 19:55:27 +0000 (13:55 -0600)
committerSage Weil <sage@redhat.com>
Sun, 9 Feb 2020 19:55:27 +0000 (13:55 -0600)
commit9dba764c02cc79bb550e0dda9bf0de1f89ef8a68
treef5fdc16c08576b5339f5edf6c4d3c2ec2785dade
parentc11d031bab5eee9c7315d7a4bff85c86577de65c
parent36daf1cc299c67375c15e4dcf1e1b7d5f3b227d2
Merge PR #33133 into master

* refs/pull/33133/head:
qa/workunits/cephadm/test_cephadm.sh: make monitoring tests faster
qa/workunits/cephadm/test_cephadm: 2 OSDs is enough
cephadm: disable node-exporter cpu/memory limits for the time being

Reviewed-by: Michael Fritch <mfritch@suse.com>