From: Sage Weil <sage@newdream.net>
Date: Wed, 19 May 2021 11:52:17 +0000 (-0400)
Subject: Merge PR #41370 into master
X-Git-Tag: v17.1.0~1922
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=825481b4f3b78598955a492fab1e06151ddebc42;p=ceph.git

Merge PR #41370 into master

* refs/pull/41370/head:
	mgr/cephadm: pin haproxy image to 2.3.z

Reviewed-by: Daniel Pivonka <dpivonka@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
---

825481b4f3b78598955a492fab1e06151ddebc42