[RELEASE] Released version 2.4-dev0

Released version 2.4-dev0 with the following main changes :
    - MINOR: version: it's development again.
    - DOC: mention in INSTALL that it's development again

diff --git a/CHANGELOG b/CHANGELOG
index c9a85b4d351b4643f0e50d2b688ed589ac52ac72..dac45d19b7f13c1f6b8a964a2f27c748bc39291e 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 ChangeLog :
 ===========
 
+2020/11/05 : 2.4-dev0
+    - MINOR: version: it's development again.
+    - DOC: mention in INSTALL that it's development again
+
 2020/11/05 : 2.3.0
     - CLEANUP: pattern: remove unused entry "tree" in pattern.val
     - BUILD: ssl: use SSL_CTRL_GET_RAW_CIPHERLIST instead of OpenSSL versions

diff --git a/VERSION b/VERSION
index 276cbf9e2858c779297bb9f73b34170302949ec4..36f26304fd97c9ba49d27cfa81cc4a4b57510f1d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.0
+2.4-dev0

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 20545c631fe4b25b02c07ac953872f3b88fad553..e85c525cecc1342c4549f53c846c19394ae98e1a 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,7 +2,7 @@
                                 HAProxy
                           Configuration Manual
                          ----------------------
-                              version 2.3
+                              version 2.4
                              willy tarreau
                               2020/11/05
 

diff --git a/doc/intro.txt b/doc/intro.txt
index 7cb04b90348a86b9b1f1eddda3f17d15e0e0a301..896a1c176a93980a46f0824446527ead4d380282 100644 (file)
--- a/doc/intro.txt
+++ b/doc/intro.txt
@@ -1,7 +1,7 @@
                              -----------------------
                               HAProxy Starter Guide
                              -----------------------
-                                   version 2.3
+                                   version 2.4
 
 
 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 1ca5f7bef22879b86032099b1af15a36f8705f98..bf475ae133d27fa57b76562efe5e98a66fdb2cc8 100644 (file)
--- a/doc/management.txt
+++ b/doc/management.txt
@@ -1,7 +1,7 @@
                              ------------------------
                              HAProxy Management Guide
                              ------------------------
-                                   version 2.3
+                                   version 2.4
 
 
 This document describes how to start, stop, manage, and troubleshoot HAProxy,

diff --git a/include/haproxy/version.h b/include/haproxy/version.h
index f2bf12a5bdcf507797b5b32daa965decf6d2c32d..6d67290ce7facf7969cdbc530955100ce3ea9174 100644 (file)
--- 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.3"
+#define PRODUCT_BRANCH   "2.4"
 #endif
 
 #ifdef  CONFIG_PRODUCT_STATUS