From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 14 Jan 2021 22:24:45 +0000 (+0000)
Subject: Merge version 2.2.6-2+rpi1 and 2.2.7-1 to produce 2.2.7-1+rpi1
X-Git-Tag: archive/raspbian/2.2.7-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f4760f14c1e4d1dfcf40a50f3a462c148403f57a;p=haproxy.git

Merge version 2.2.6-2+rpi1 and 2.2.7-1 to produce 2.2.7-1+rpi1
---

f4760f14c1e4d1dfcf40a50f3a462c148403f57a
diff --cc debian/changelog
index ed67675,405a06f..f48287b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- haproxy (2.2.6-2+rpi1) bullseye-staging; urgency=medium
++haproxy (2.2.7-1+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>  Sun, 10 Jan 2021 09:59:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Jan 2021 22:24:45 +0000
++
+ haproxy (2.2.7-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - BUG/MAJOR: ring: tcp forward on ring can break the reader counter.
+     - BUG/MAJOR: spoa/python: Fixing return None
+ 
+  -- Vincent Bernat <bernat@debian.org>  Sat, 09 Jan 2021 15:31:08 +0100
  
  haproxy (2.2.6-2) unstable; urgency=medium