diff --git a/CHANGELOG b/CHANGELOG index f46871f6c..bea403245 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ ChangeLog : =========== +2024/11/26 : 3.2-dev0 + - exact copy of 3.1.0 + 2024/11/26 : 3.1.0 - BUG/MAJOR: mux-h1: Properly handle wrapping on obuf when dumping the first-line - BUILD: activity/memprofile: fix a build warning in the posix_memalign handler diff --git a/VERSION b/VERSION index fd2a01863..098417e61 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0 +3.2-dev0 diff --git a/doc/configuration.txt b/doc/configuration.txt index 24f437ee4..8a7e591df 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -2,7 +2,7 @@ HAProxy Configuration Manual ---------------------- - version 3.1 + version 3.2 2024/11/26 diff --git a/doc/intro.txt b/doc/intro.txt index 4e076a8fc..2fa9d5238 100644 --- a/doc/intro.txt +++ b/doc/intro.txt @@ -1,7 +1,7 @@ ----------------------- HAProxy Starter Guide ----------------------- - version 3.1 + version 3.2 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 9c2a23617..b9e3502fa 100644 --- a/doc/management.txt +++ b/doc/management.txt @@ -1,7 +1,7 @@ ------------------------ HAProxy Management Guide ------------------------ - version 3.1 + version 3.2 This document describes how to start, stop, manage, and troubleshoot HAProxy, diff --git a/include/haproxy/version.h b/include/haproxy/version.h index 7030eb68a..5b5c50b44 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 "3.1" +#define PRODUCT_BRANCH "3.2" #endif #ifdef CONFIG_PRODUCT_STATUS