From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 17 Jun 2021 15:23:45 +0000 (+0100)
Subject: Merge version 2.2.9-1+rpi1 and 2.2.9-2 to produce 2.2.9-2+rpi1
X-Git-Tag: archive/raspbian/2.2.9-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=559bd2f16daffda5563becbeec99e881a428e2c2;p=haproxy.git

Merge version 2.2.9-1+rpi1 and 2.2.9-2 to produce 2.2.9-2+rpi1
---

559bd2f16daffda5563becbeec99e881a428e2c2
diff --cc debian/changelog
index 7cdacef,40574d3..28afc8c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- haproxy (2.2.9-1+rpi1) bullseye-staging; urgency=medium
++haproxy (2.2.9-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.8.19-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 14 Mar 2019 20:25:01 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 10 Feb 2021 11:35:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 17 Jun 2021 15:23:45 +0000
++
+ haproxy (2.2.9-2) unstable; urgency=medium
+ 
+   * d/patches: fix agent-check regression putting down servers.
+     Closes: #988779.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Thu, 27 May 2021 15:00:01 +0200
  
  haproxy (2.2.9-1) unstable; urgency=medium