diff --git a/CHANGELOG b/CHANGELOG index c9a85b4d3..dac45d19b 100644 --- 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 276cbf9e2..36f26304f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.0 +2.4-dev0 diff --git a/doc/configuration.txt b/doc/configuration.txt index 20545c631..e85c525ce 100644 --- 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 7cb04b903..896a1c176 100644 --- 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 1ca5f7bef..bf475ae13 100644 --- 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 f2bf12a5b..6d67290ce 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.3" +#define PRODUCT_BRANCH "2.4" #endif #ifdef CONFIG_PRODUCT_STATUS