]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #39069 into master
authorSage Weil <sage@newdream.net>
Wed, 3 Feb 2021 15:38:49 +0000 (10:38 -0500)
committerSage Weil <sage@newdream.net>
Wed, 3 Feb 2021 15:38:49 +0000 (10:38 -0500)
commitb70a63a91759ac9ae5c696580d78ed2543409e9b
tree6964dee4baab66b135eec88963a4aac34a34a37f
parent4308142b0929dc07a17f511ca9000197e53309da
parentb0ff67b7ff321ed6e73ab19ea6282ebc75546b19
Merge PR #39069 into master

* refs/pull/39069/head:
mgr/cephadm/upgrade: tolerate pre-pacific upgrade state
mgr/cephadm/upgrade: scale down MDS cluster(s) for major version upgrades
mgr/cephadm: fix capitalization, level; drop elipses of log msgs
mgr/cephadm/upgrade: match against any repo_digest, not image_id
cephadm: return repo_digests (plural) in pull/inspect output
mgr/cephadm: include container_image_digests in inventory
cephadm: include image_digests list in 'ls' output
vstart.sh: only extract first container digest
mgr/cephadm: move release -> major translation to helper
mgr/cephadm/upgrade: tolerate old upgrade_state.target_versoin
mgr/cephadm/upgrade: set require-osd-release when done with OSDs
mgr: add lookup_release_name(int) to mgr interface
mgr/cephadm: verify container image version after we pull it
mgr/cephadm: only save version portion of version string
cephadm: fix 'inspect' and 'pull'
mgr/cephadm/upgrade: implement N-2 version checks on upgrade start

Reviewed-by: Sebastian Wagner <swagner@suse.com>
src/cephadm/cephadm
src/cephadm/tests/test_cephadm.py