From: Willy Tarreau <w@1wt.eu>
Date: Thu, 8 Jul 2021 15:30:35 +0000 (+0200)
Subject: [RELEASE] Released version 2.3.12
X-Git-Tag: v2.3.12^0
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=b99e499c489bada1364c59a2804ffb9254e4bc1b;p=haproxy-2.3.git

[RELEASE] Released version 2.3.12

Released version 2.3.12 with the following main changes :
    - BUG/MAJOR: pools: fix incomplete backport of lockless pool fix
    - BUG/MAJOR: pools: second fix for incomplete backport of lockless pool fix
---

diff --git a/CHANGELOG b/CHANGELOG
index feed477..54344b1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 ChangeLog :
 ===========
 
+2021/07/08 : 2.3.12
+    - BUG/MAJOR: pools: fix incomplete backport of lockless pool fix
+    - BUG/MAJOR: pools: second fix for incomplete backport of lockless pool fix
+
 2021/07/07 : 2.3.11
     - BUG/MINOR: mux-fcgi: Don't send normalized uri to FCGI application
     - BUG/MINOR: htx: Preserve HTX flags when draining data from an HTX message
diff --git a/VERDATE b/VERDATE
index e883490..0d8f275 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2021/07/07
+2021/07/08
diff --git a/VERSION b/VERSION
index f470771..b001d23 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.11
+2.3.12
diff --git a/doc/configuration.txt b/doc/configuration.txt
index b4a316e..056e414 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -4,7 +4,7 @@
                          ----------------------
                               version 2.3
                              willy tarreau
-                              2021/07/07
+                              2021/07/08
 
 
 This document covers the configuration language as implemented in the version