]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>
1  2 
src/cephadm/cephadm patch | diff1 | diff2 | blob | history

diff --cc src/cephadm/cephadm
Simple merge
Unnamed repository; edit this file 'description' to name the repository.