]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #40500 into master
authorSage Weil <sage@newdream.net>
Mon, 5 Apr 2021 13:16:34 +0000 (09:16 -0400)
committerSage Weil <sage@newdream.net>
Mon, 5 Apr 2021 13:16:34 +0000 (09:16 -0400)
* refs/pull/40500/head:
doc/cephadm: remove keepalived_user from haproxy docs

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>

Trivial merge