From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 14 Aug 2020 02:11:18 +0000 (+0100)
Subject: Merge version 2.0.16-1+rpi1 and 2.0.17-1 to produce 2.0.17-1+rpi1
X-Git-Tag: archive/raspbian/2.0.17-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d130ce3a20a33fb09d7e628ba7705c93d7171ae4;p=haproxy.git

Merge version 2.0.16-1+rpi1 and 2.0.17-1 to produce 2.0.17-1+rpi1
---

d130ce3a20a33fb09d7e628ba7705c93d7171ae4
diff --cc debian/changelog
index 9dad4ec,cd173b4..afc7020
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- haproxy (2.0.16-1+rpi1) bullseye-staging; urgency=medium
++haproxy (2.0.17-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>  Fri, 24 Jul 2020 15:09:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 14 Aug 2020 02:11:18 +0000
++
+ haproxy (2.0.17-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - BUG/MAJOR: dns: Make the do-resolve action thread-safe
+ 
+  -- Vincent Bernat <bernat@debian.org>  Sat, 01 Aug 2020 20:05:01 +0200
  
  haproxy (2.0.16-1) unstable; urgency=medium