From: Willy Tarreau Date: Fri, 14 May 2021 07:36:37 +0000 (+0200) Subject: [RELEASE] Released version 2.5-dev0 X-Git-Tag: v2.5-dev0^0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f97306ecc0cf1e0b7c324406f45b256286e9766;p=thirdparty%2Fhaproxy.git [RELEASE] Released version 2.5-dev0 Released version 2.5-dev0 with the following main changes : - MINOR: version: it's development again --- diff --git a/CHANGELOG b/CHANGELOG index 0f8b73be0f..54ec398c5b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ ChangeLog : =========== +2021/05/14 : 2.5-dev0 + - MINOR: version: it's development again + 2021/05/14 : 2.4.0 - BUG/MINOR: http_fetch: fix possible uninit sockaddr in fetch_url_ip/port - CLEANUP: cli/activity: Remove double spacing in set profiling command diff --git a/VERSION b/VERSION index 197c4d5c2d..f7fe154188 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.0 +2.5-dev0 diff --git a/doc/configuration.txt b/doc/configuration.txt index a13a9a77f8..11c38945c2 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -2,7 +2,7 @@ HAProxy Configuration Manual ---------------------- - version 2.4 + version 2.5 willy tarreau 2021/05/14 diff --git a/doc/intro.txt b/doc/intro.txt index 54e8ea142f..6387ff4c1f 100644 --- a/doc/intro.txt +++ b/doc/intro.txt @@ -1,7 +1,7 @@ ----------------------- HAProxy Starter Guide ----------------------- - version 2.4 + version 2.5 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 2307d72e80..aaacdfbb56 100644 --- a/doc/management.txt +++ b/doc/management.txt @@ -1,7 +1,7 @@ ------------------------ HAProxy Management Guide ------------------------ - version 2.4 + version 2.5 This document describes how to start, stop, manage, and troubleshoot HAProxy, diff --git a/include/haproxy/version.h b/include/haproxy/version.h index 6d67290ce7..d89d15a732 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.4" +#define PRODUCT_BRANCH "2.5" #endif #ifdef CONFIG_PRODUCT_STATUS