]> 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: 21ab6c5 729ebaa)
Merge PR #41149 into master
authorSage Weil <sage@newdream.net>
Wed, 5 May 2021 15:57:28 +0000 (11:57 -0400)
committerSage Weil <sage@newdream.net>
Wed, 5 May 2021 15:57:28 +0000 (11:57 -0400)
* refs/pull/41149/head:
mgr/cephadm: remove haproxy+keepalived container image from service spec

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

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