[RELEASE] Released version 2.6-dev0

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

diff --git a/CHANGELOG b/CHANGELOG
index c7955e15921342e61b9edb0dab1c24e63b01f008..3cdc2cdeca6044a25e4bab899d08eb235a4489e3 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 ChangeLog :
 ===========
 
+2021/11/23 : 2.6-dev0
+    - MINOR: version: it's development again
+
 2021/11/23 : 2.5.0
     - BUILD: SSL: add quictls build to scripts/build-ssl.sh
     - BUILD: SSL: add QUICTLS to build matrix

diff --git a/VERSION b/VERSION
index 437459cd94c9fa59d82c61c0bc8aa36e293b735e..e7602e7b1513b29a2f5a727c67fcecdf1a6316c6 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.0
+2.6-dev0

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 62bf22660d48104269358665d93feaf6cf9d8c49..737a0d3a08726bd562b9d96abfb84273d021295d 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,7 +2,7 @@
                                 HAProxy
                           Configuration Manual
                          ----------------------
-                              version 2.5
+                              version 2.6
                              willy tarreau
                               2021/11/23
 

diff --git a/doc/intro.txt b/doc/intro.txt
index 517ca2c3e8582c8fbb33d7eabdf9aa6a3f860e26..8c060045d65dbe2a8747a993b3b9fef9a7d3ac54 100644 (file)
--- a/doc/intro.txt
+++ b/doc/intro.txt
@@ -1,7 +1,7 @@
                              -----------------------
                               HAProxy Starter Guide
                              -----------------------
-                                   version 2.5
+                                   version 2.6
 
 
 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 146ae2e22513b8c06416c7b2bbf623ec26b9874a..763f5f204718de23456414b892031ec8af607219 100644 (file)
--- a/doc/management.txt
+++ b/doc/management.txt
@@ -1,7 +1,7 @@
                              ------------------------
                              HAProxy Management Guide
                              ------------------------
-                                   version 2.5
+                                   version 2.6
 
 
 This document describes how to start, stop, manage, and troubleshoot HAProxy,

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