]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit53120a611547ec2b138c708858fe4518bfc4bfdc
tree7905854f4ebd036be6d8e76fb53de0e638a8fa95tree | snapshot
parent38930d3df54e185bd0149831f5791dd8254a74d8commit | diff
parent762f0bbb708caaff5a9959c084f1d6ddf9a5431ecommit | diff
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 <mfritch@suse.com>
Unnamed repository; edit this file 'description' to name the repository.