diff --git a/CHANGELOG b/CHANGELOG index 4274ffe68..656586d5e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ ChangeLog : =========== +2020/07/07 : 2.3-dev0 + - exact copy of 2.2.0 + 2020/07/07 : 2.2.0 - BUILD: mux-h2: fix typo breaking build when using DEBUG_LOCK - CLEANUP: makefile: update the outdated list of DEBUG_xxx options diff --git a/VERSION b/VERSION index ccbccc3dc..a9ef35635 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.0 +2.3-dev0 diff --git a/doc/configuration.txt b/doc/configuration.txt index 53255c1db..b1711b219 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -2,7 +2,7 @@ HAProxy Configuration Manual ---------------------- - version 2.2 + version 2.3 willy tarreau 2020/07/07 diff --git a/doc/intro.txt b/doc/intro.txt index dbec9348a..7cb04b903 100644 --- a/doc/intro.txt +++ b/doc/intro.txt @@ -1,7 +1,7 @@ ----------------------- HAProxy Starter Guide ----------------------- - version 2.2 + version 2.3 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 0585d38d8..7346d6301 100644 --- a/doc/management.txt +++ b/doc/management.txt @@ -1,7 +1,7 @@ ------------------------ HAProxy Management Guide ------------------------ - version 2.2 + version 2.3 This document describes how to start, stop, manage, and troubleshoot HAProxy, diff --git a/include/haproxy/version.h b/include/haproxy/version.h index 6c06807d0..73a5633de 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.2" +#define PRODUCT_BRANCH "2.3" #endif #ifdef CONFIG_PRODUCT_STATUS