From: Sage Weil <sage@newdream.net>
Date: Mon, 5 Apr 2021 13:16:34 +0000 (-0400)
Subject: Merge PR #40500 into master
X-Git-Tag: v17.1.0~2376
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d49bc22a105d904c434661a6f0671e28bf1e808b;p=ceph.git

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

d49bc22a105d904c434661a6f0671e28bf1e808b