]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38930d3 762f0bb)
Merge PR #33730 into master
authorSage Weil <sage@redhat.com>
Thu, 5 Mar 2020 01:20:27 +0000 (19:20 -0600)
committerSage Weil <sage@redhat.com>
Thu, 5 Mar 2020 01:20:27 +0000 (19:20 -0600)
* 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 <mfritch@suse.com>

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