From: Willy Tarreau <w@1wt.eu>
Date: Tue, 23 Nov 2021 14:40:21 +0000 (+0100)
Subject: [RELEASE] Released version 2.5.0
X-Git-Tag: v2.5.0^0
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=f2e0833f16aa8c09e1c7001ff55aac4f13c643b7;p=haproxy-2.5.git

[RELEASE] Released version 2.5.0

Released version 2.5.0 with the following main changes :
    - BUILD: SSL: add quictls build to scripts/build-ssl.sh
    - BUILD: SSL: add QUICTLS to build matrix
    - CLEANUP: sock: Wrap `accept4_broken = 1` into additional parenthesis
    - BUILD: cli: clear a maybe-unused  warning on some older compilers
    - BUG/MEDIUM: cli: make sure we can report a warning from a bind keyword
    - BUG/MINOR: ssl: make SSL counters atomic
    - CLEANUP: assorted typo fixes in the code and comments
    - BUG/MINOR: ssl: free correctly the sni in the backend SSL cache
    - MINOR: version: mention that it's stable now
---

diff --git a/CHANGELOG b/CHANGELOG
index 373cbc7..c7955e1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,17 @@
 ChangeLog :
 ===========
 
+2021/11/23 : 2.5.0
+    - BUILD: SSL: add quictls build to scripts/build-ssl.sh
+    - BUILD: SSL: add QUICTLS to build matrix
+    - CLEANUP: sock: Wrap `accept4_broken = 1` into additional parenthesis
+    - BUILD: cli: clear a maybe-unused  warning on some older compilers
+    - BUG/MEDIUM: cli: make sure we can report a warning from a bind keyword
+    - BUG/MINOR: ssl: make SSL counters atomic
+    - CLEANUP: assorted typo fixes in the code and comments
+    - BUG/MINOR: ssl: free correctly the sni in the backend SSL cache
+    - MINOR: version: mention that it's stable now
+
 2021/11/19 : 2.5-dev15
     - BUG/MINOR: stick-table/cli: Check for invalid ipv6 key
     - CLEANUP: peers: Remove useless test on peer variable in peer_trace()
diff --git a/VERDATE b/VERDATE
index ee32615..3bb192d 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2021/11/19
+2021/11/23
diff --git a/VERSION b/VERSION
index 1bad3f7..437459c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-dev15
+2.5.0
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 89ad970..62bf226 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -4,7 +4,7 @@
                          ----------------------
                               version 2.5
                              willy tarreau
-                              2021/11/19
+                              2021/11/23
 
 
 This document covers the configuration language as implemented in the version