From: Sage Weil Date: Mon, 23 Mar 2020 13:24:06 +0000 (-0500) Subject: Merge PR #34105 into master X-Git-Tag: v16.0.0~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=de20c7bc6194d0926398aa3877e6a4f28d1714b5;p=ceph.git Merge PR #34105 into master * refs/pull/34105/head: Merge PR #34042 into octopus Merge PR #33959 into octopus Merge PR #34067 into octopus mgr/DaemonServer: add explicit check that acting matches for merge Merge pull request #34040 from dillaman/wip-44396-partial-fix Merge PR #34098 into octopus mgr/rook: list rgw services mgr/rook: tolerate timestamps that are None mgr/orch: add 'subcluster' property to RGWSpec mgr/rook: do not create radosgw pools mgr/rook: refactor apply/add for rgw Merge PR #34082 into octopus Merge PR #34068 into octopus cephadm: relabel /etc/ganesha mount Merge PR #34046 into octopus Merge PR #34092 into octopus Merge pull request #33719 from ukernel/wip-44416 rbd-mirror: leader watcher should not cancel get locker if locker is invalid rbd-mirror: snapshot sync request needs to check for interruption librbd: request exclusive lock when moving to trash rbd-mirror: basic integration with sync throttling rbd-mirror: don't prematurely finish snapshot replay loop rbd-mirror: pass InstanceWatcher to snapshot Replayer doc/releases/octopus.rst: add note about ec recovery below min_size mgr/cephadm: configure rgw_frontends for rgw service cephadm: switch grafana image to the ceph repo Merge PR #34034 into octopus qa/suites/rados/cephadm/upgrade: update starting version Merge PR #33540 into octopus Merge PR #34023 into octopus Merge PR #34044 into octopus Merge PR #34030 into octopus doc/orchestrator: update rgw creation mgr/cephadm: clean up client.crash.* container_image settings after upgrade cephadm: make add-repo --release and --version independent cephadm: env over last used mgr/orch: accept port and ssl flags to 'apply rgw' mgr/orch: 'ceph upgrade ...' -> 'ceph orch upgrade ...' cephadm: fall back to default for infer_image cephadm: remove outdated check cephadm: consolidate default image logic remove ceph_test_rados_watch_notify python-common/ceph/deployment/service_spec: add ssl to RGWSpec cephadm: only infer image for shell, run, inspect-image, pull, ceph-volume mgr/test_orchestrator: fix service filtering when using dummy data mgr/dashboard: fix adding/removing host errors mgr/rook: fix 'orch ps' for osds qa: fix all the fsx.sh-invoking yaml files to install dependencies mds: pass proper MutationImpl::LockOp to Locker::wrlock_start() Reviewed-by: Kiefer Chang Reviewed-by: Laura Paduano --- de20c7bc6194d0926398aa3877e6a4f28d1714b5