]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 671ba83 f33bf06)
Merge PR #40321 into master
authorSage Weil <sage@newdream.net>
Fri, 26 Mar 2021 12:19:06 +0000 (08:19 -0400)
committerSage Weil <sage@newdream.net>
Fri, 26 Mar 2021 12:19:06 +0000 (08:19 -0400)
commit7283a58f3dc33334991c32fec2dce9c9f77ded1b
tree90a7b4c2ecec6ac7520c27c29ea0e80fad0e7653tree | snapshot
parent671ba83c0bb4d3d4ee6a790aae5e2118f5db8bbccommit | diff
parentf33bf0647bab441993777827903bf046c1c3d80acommit | diff
Merge PR #40321 into master

* refs/pull/40321/head:
cephadm: fix parsing of keepalived version (drop leading 'v')
cephadm: keepalived needs --cap-add=NET_RAW
cephadm: fix --cap-add=NET_ADMIN
cephadm: fix quoting for keepalived env var
mgr/cephadm: ha-rgw: use correct port

Reviewed-by: Michael Fritch <mfritch@suse.com>
src/cephadm/cephadm diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.