]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c11d031 36daf1c)
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)
* 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>

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