From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 7 Jan 2020 08:21:42 +0000 (+0000)
Subject: Merge version 2.0.10-1+rpi1 and 2.0.12-1 to produce 2.0.12-1+rpi1
X-Git-Tag: archive/raspbian/2.0.12-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fa0a4af322a8b6f94096c824bf010fecc5543139;p=haproxy.git

Merge version 2.0.10-1+rpi1 and 2.0.12-1 to produce 2.0.12-1+rpi1
---

fa0a4af322a8b6f94096c824bf010fecc5543139
diff --cc debian/changelog
index f2f1707,cdd74cf..b44820e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,25 @@@
- haproxy (2.0.10-1+rpi1) bullseye-staging; urgency=medium
++haproxy (2.0.12-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>  Thu, 28 Nov 2019 14:07:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 07 Jan 2020 08:21:42 +0000
++
+ haproxy (2.0.12-1) unstable; urgency=medium
+ 
+   * New upstream version.
+     - BUG/MAJOR: task: add a new TASK_SHARED_WQ flag to fix foreign requeuing
+   * d/logrotate.conf: use rsyslog helper instead of SysV init script.
+     Closes: #946973.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Fri, 20 Dec 2019 08:20:33 +0100
+ 
+ haproxy (2.0.11-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - BUG/MAJOR: dns: add minimalist error processing on the Rx path
+ 
+  -- Vincent Bernat <bernat@debian.org>  Fri, 13 Dec 2019 19:22:03 +0100
  
  haproxy (2.0.10-1) unstable; urgency=medium