From 1eb0f22ee1b64d75c8535b5a48f96b6ead91a341 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 29 May 2024 15:00:02 +0200 Subject: [PATCH] [RELEASE] Released version 3.1-dev0 Released version 3.1-dev0 with the following main changes : - MINOR: version: mention that it's development again --- CHANGELOG | 3 +++ VERSION | 2 +- doc/configuration.txt | 2 +- doc/intro.txt | 2 +- doc/management.txt | 2 +- include/haproxy/version.h | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index abd27db2a9..f2f61a2909 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ ChangeLog : =========== +2024/05/29 : 3.1-dev0 + - MINOR: version: mention that it's development again + 2024/05/29 : 3.0.0 - MINOR: sample: implement the uptime sample fetch - CI: scripts: fix build of vtest regarding option -C diff --git a/VERSION b/VERSION index 4a36342fca..a8457d4dd8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0 +3.1-dev0 diff --git a/doc/configuration.txt b/doc/configuration.txt index 6a02988876..443a2aa6bc 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -2,7 +2,7 @@ HAProxy Configuration Manual ---------------------- - version 3.0 + version 3.1 2024/05/29 diff --git a/doc/intro.txt b/doc/intro.txt index c3f6cdae5b..4e076a8fc9 100644 --- a/doc/intro.txt +++ b/doc/intro.txt @@ -1,7 +1,7 @@ ----------------------- HAProxy Starter Guide ----------------------- - version 3.0 + version 3.1 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 d0360185f5..76357ecd9d 100644 --- a/doc/management.txt +++ b/doc/management.txt @@ -1,7 +1,7 @@ ------------------------ HAProxy Management Guide ------------------------ - version 3.0 + version 3.1 This document describes how to start, stop, manage, and troubleshoot HAProxy, diff --git a/include/haproxy/version.h b/include/haproxy/version.h index 11023e6005..1d8d211622 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.0" +#define PRODUCT_BRANCH "3.1" #endif #ifdef CONFIG_PRODUCT_STATUS