]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commitd49bc22a105d904c434661a6f0671e28bf1e808b
treea22791bbd46e8ff1826611975443ab9055531328
parent7fb0569ec36305cd9d6c36073a7ea78c8ab7d14c
parentd4630eaab43c14d388918003c771f01b64bdd42e
Merge PR #40500 into master

* 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>