]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c707d45 bb00de5)
Merge PR #40472 into master
authorSage Weil <sage@newdream.net>
Mon, 29 Mar 2021 16:20:39 +0000 (12:20 -0400)
committerSage Weil <sage@newdream.net>
Mon, 29 Mar 2021 16:20:39 +0000 (12:20 -0400)
* refs/pull/40472/head:
mgr/cephadm/upgrade: ignore deployed_by until mgr is upgraded

Reviewed-by: Adam King <adking@redhat.com>

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