From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 18 Jun 2020 17:21:52 +0000 (+0100)
Subject: Merge version 2.0.14-1+rpi1 and 2.0.15-1 to produce 2.0.15-1+rpi1
X-Git-Tag: archive/raspbian/2.0.15-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6612cac02d262f75c1edcc4e548704b910883c73;p=haproxy.git

Merge version 2.0.14-1+rpi1 and 2.0.15-1 to produce 2.0.15-1+rpi1
---

6612cac02d262f75c1edcc4e548704b910883c73
diff --cc debian/changelog
index 0fd001a,e949e87..e95412f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- haproxy (2.0.14-1+rpi1) bullseye-staging; urgency=medium
++haproxy (2.0.15-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 Apr 2020 21:52:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jun 2020 17:21:52 +0000
++
+ haproxy (2.0.15-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - BUG/MAJOR: stream-int: always detach a faulty endpoint on connect
+                  failure
+ 
+  -- Vincent Bernat <bernat@debian.org>  Sat, 13 Jun 2020 18:48:25 +0200
  
  haproxy (2.0.14-1) unstable; urgency=medium