From 9dc6b97429ce0f5be142fa9b920bf0ef0a714d73 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 16 Jun 2019 21:49:47 +0200 Subject: [PATCH] [RELEASE] Released version 2.1-dev0 Released version 2.1-dev0 with the following main changes : - exact copy of 2.0.0 --- CHANGELOG | 3 +++ VERSION | 2 +- doc/configuration.txt | 2 +- doc/intro.txt | 2 +- doc/management.txt | 2 +- include/common/version.h | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 68a3aca4c..6b992eb4f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ ChangeLog : =========== +2019/06/16 : 2.1-dev0 + - exact copy of 2.0.0 + 2019/06/16 : 2.0.0 - MINOR: fd: Don't use atomic operations when it's not needed. - DOC: mworker-prog: documentation for the program section diff --git a/VERSION b/VERSION index 227cea215..77a9f8e48 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0 +2.1-dev0 diff --git a/doc/configuration.txt b/doc/configuration.txt index fd06b1a8f..3e402fb92 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -2,7 +2,7 @@ HAProxy Configuration Manual ---------------------- - version 2.0 + version 2.1 willy tarreau 2019/06/16 diff --git a/doc/intro.txt b/doc/intro.txt index a60844c5a..0ee9fa2d1 100644 --- a/doc/intro.txt +++ b/doc/intro.txt @@ -1,7 +1,7 @@ ----------------------- HAProxy Starter Guide ----------------------- - version 2.0 + version 2.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 616a040b7..93bee671b 100644 --- a/doc/management.txt +++ b/doc/management.txt @@ -1,7 +1,7 @@ ------------------------ HAProxy Management Guide ------------------------ - version 2.0 + version 2.1 This document describes how to start, stop, manage, and troubleshoot HAProxy, diff --git a/include/common/version.h b/include/common/version.h index 305087db1..49427468c 100644 --- a/include/common/version.h +++ b/include/common/version.h @@ -33,7 +33,7 @@ #ifdef CONFIG_PRODUCT_BRANCH #define PRODUCT_BRANCH CONFIG_PRODUCT_BRANCH #else -#define PRODUCT_BRANCH "2.0" +#define PRODUCT_BRANCH "2.1" #endif #ifdef CONFIG_PRODUCT_URL