[RELEASE] Released version 2.5-dev0

Released version 2.5-dev0 with the following main changes :
    - MINOR: version: it's development again

diff --git a/CHANGELOG b/CHANGELOG
index 0f8b73be0fbbace2c2c0bb2db52362a55d0bdc53..54ec398c5bb001d3346b03c51879d873a4731393 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 ChangeLog :
 ===========
 
+2021/05/14 : 2.5-dev0
+    - MINOR: version: it's development again
+
 2021/05/14 : 2.4.0
     - BUG/MINOR: http_fetch: fix possible uninit sockaddr in fetch_url_ip/port
     - CLEANUP: cli/activity: Remove double spacing in set profiling command

diff --git a/VERSION b/VERSION
index 197c4d5c2d7c724b4cd0048f4e3574bb3fa5c8db..f7fe154188b3a2e5a3c7bba680ea9d1fec3a95d3 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.0
+2.5-dev0

diff --git a/doc/configuration.txt b/doc/configuration.txt
index a13a9a77f8a077a6ac798b1dccc8a0f2f3f67396..11c38945c29d2d28c9afb13afed60b30a97069cb 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,7 +2,7 @@
                                 HAProxy
                           Configuration Manual
                          ----------------------
-                              version 2.4
+                              version 2.5
                              willy tarreau
                               2021/05/14
 

diff --git a/doc/intro.txt b/doc/intro.txt
index 54e8ea142f7f9d8613beda4c73f3840cb7f549f0..6387ff4c1fbb811c4449aa681e8064fb911f68cb 100644 (file)
--- a/doc/intro.txt
+++ b/doc/intro.txt
@@ -1,7 +1,7 @@
                              -----------------------
                               HAProxy Starter Guide
                              -----------------------
-                                   version 2.4
+                                   version 2.5
 
 
 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 2307d72e80b1b37a40b460d04ee55fdc37cbe501..aaacdfbb56f7ab678e640ff84f21afed47b478e0 100644 (file)
--- a/doc/management.txt
+++ b/doc/management.txt
@@ -1,7 +1,7 @@
                              ------------------------
                              HAProxy Management Guide
                              ------------------------
-                                   version 2.4
+                                   version 2.5
 
 
 This document describes how to start, stop, manage, and troubleshoot HAProxy,

diff --git a/include/haproxy/version.h b/include/haproxy/version.h
index 6d67290ce7facf7969cdbc530955100ce3ea9174..d89d15a732113873fdb4bc540edabe5496534559 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.4"
+#define PRODUCT_BRANCH   "2.5"
 #endif
 
 #ifdef  CONFIG_PRODUCT_STATUS