From: Sage Weil Date: Sun, 9 Feb 2020 19:55:27 +0000 (-0600) Subject: Merge PR #33133 into master X-Git-Tag: v15.1.1~492 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9dba764c02cc79bb550e0dda9bf0de1f89ef8a68;p=ceph.git 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 --- 9dba764c02cc79bb550e0dda9bf0de1f89ef8a68