From: Sage Weil Date: Thu, 5 Mar 2020 01:20:27 +0000 (-0600) Subject: Merge PR #33730 into master X-Git-Tag: v15.1.1~115 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=53120a611547ec2b138c708858fe4518bfc4bfdc;p=ceph-ci.git Merge PR #33730 into master * refs/pull/33730/head: cephadm/vstart-smoke.sh: a smoke test to run against vstart mgr/cephadm: fix prom reconfig loop when dashboard is disabled mgr/cephadm: clean up log messages a bit mgr/cephadm: force remove daemons when removing service mgr/cephadm: do not error out on service rm|action if no daemons mgr/orchestrator: allow 'orch rm mon|mgr --force' Reviewed-by: Michael Fritch --- 53120a611547ec2b138c708858fe4518bfc4bfdc