From: Willy Tarreau <w@1wt.eu>
Date: Tue, 7 Jul 2020 14:35:28 +0000 (+0200)
Subject: [RELEASE] Released version 2.3-dev0
X-Git-Tag: v2.3-dev0~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33205c23a7d28aac916f27b280dd8654d667a360;p=thirdparty%2Fhaproxy.git

[RELEASE] Released version 2.3-dev0

Released version 2.3-dev0 with the following main changes :
    - exact copy of 2.2.0
---

diff --git a/CHANGELOG b/CHANGELOG
index 4274ffe68b..656586d5e7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 ChangeLog :
 ===========
 
+2020/07/07 : 2.3-dev0
+    - exact copy of 2.2.0
+
 2020/07/07 : 2.2.0
     - BUILD: mux-h2: fix typo breaking build when using DEBUG_LOCK
     - CLEANUP: makefile: update the outdated list of DEBUG_xxx options
diff --git a/VERSION b/VERSION
index ccbccc3dc6..a9ef356354 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.0
+2.3-dev0
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 53255c1db5..b1711b2198 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,7 +2,7 @@
                                 HAProxy
                           Configuration Manual
                          ----------------------
-                              version 2.2
+                              version 2.3
                              willy tarreau
                               2020/07/07
 
diff --git a/doc/intro.txt b/doc/intro.txt
index dbec9348a7..7cb04b9034 100644
--- a/doc/intro.txt
+++ b/doc/intro.txt
@@ -1,7 +1,7 @@
                              -----------------------
                               HAProxy Starter Guide
                              -----------------------
-                                   version 2.2
+                                   version 2.3
 
 
 This document is an introduction to HAProxy for all those who don't know it, as
diff --git a/doc/management.txt b/doc/management.txt
index 0585d38d8d..7346d63013 100644
--- a/doc/management.txt
+++ b/doc/management.txt
@@ -1,7 +1,7 @@
                              ------------------------
                              HAProxy Management Guide
                              ------------------------
-                                   version 2.2
+                                   version 2.3
 
 
 This document describes how to start, stop, manage, and troubleshoot HAProxy,
diff --git a/include/haproxy/version.h b/include/haproxy/version.h
index 6c06807d09..73a5633de3 100644
--- a/include/haproxy/version.h
+++ b/include/haproxy/version.h
@@ -33,7 +33,7 @@
 #ifdef  CONFIG_PRODUCT_BRANCH
 #define PRODUCT_BRANCH    CONFIG_PRODUCT_BRANCH
 #else
-#define PRODUCT_BRANCH   "2.2"
+#define PRODUCT_BRANCH   "2.3"
 #endif
 
 #ifdef  CONFIG_PRODUCT_STATUS