]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #40817 into master
authorSage Weil <sage@newdream.net>
Mon, 19 Apr 2021 12:30:42 +0000 (08:30 -0400)
committerSage Weil <sage@newdream.net>
Mon, 19 Apr 2021 12:30:42 +0000 (08:30 -0400)
* refs/pull/40817/head:
mgr/MgrStandby: fix config observer
mgr/MgrStandby: respawn if mgr_standby_modules changes
qa/tasks/mgr/test_dashboard: skip test_standby if mgr_standby_modules=false
qa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service
qa/suites/rados/cephadm/smoke-singlehost: test --single-host-defaults
cephadm: add --single-host-defaults option to bootstrap
mgr/cephadm: allow mgr colo if mgr_standby_modules=false
mgr/MgrStandby: add mgr_standby_modules option

Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/common/options/global.yaml.in

Simple merge