diff --git a/CHANGELOG b/CHANGELOG index 6440ad4b7..7b181bf00 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ ChangeLog : =========== +2022/05/31 : 2.7-dev0 + - MINOR: version: it's development again + 2022/05/31 : 2.6.0 - DOC: Fix formatting in configuration.txt to fix dconv - CLEANUP: tcpcheck: Remove useless test on the stream-connector in tcpcheck_main diff --git a/VERSION b/VERSION index e70b4523a..4597ef8cc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6.0 +2.7-dev0 diff --git a/doc/configuration.txt b/doc/configuration.txt index 7f15b37b2..927c97ce3 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -2,7 +2,7 @@ HAProxy Configuration Manual ---------------------- - version 2.6 + version 2.7 2022/05/31 diff --git a/doc/intro.txt b/doc/intro.txt index 418f2ff1b..d42c399d9 100644 --- a/doc/intro.txt +++ b/doc/intro.txt @@ -1,7 +1,7 @@ ----------------------- HAProxy Starter Guide ----------------------- - version 2.6 + version 2.7 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 e178903fd..e65ac471a 100644 --- a/doc/management.txt +++ b/doc/management.txt @@ -1,7 +1,7 @@ ------------------------ HAProxy Management Guide ------------------------ - version 2.6 + version 2.7 This document describes how to start, stop, manage, and troubleshoot HAProxy, diff --git a/include/haproxy/version.h b/include/haproxy/version.h index aded9fbd0..73a00db72 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.6" +#define PRODUCT_BRANCH "2.7" #endif #ifdef CONFIG_PRODUCT_STATUS