diff --git a/CHANGELOG b/CHANGELOG index 3cf227591..774bbe6b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ ChangeLog : =========== +2019/11/25 : 2.2-dev0 + - exact copy of 2.1.0 + 2019/11/25 : 2.1.0 - BUG/MINOR: init: fix set-dumpable when using uid/gid - MINOR: init: avoid code duplication while setting identify diff --git a/VERSION b/VERSION index 7ec1d6db4..cb365cce9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.0 +2.2-dev0 diff --git a/doc/configuration.txt b/doc/configuration.txt index 7e5ecd881..2fadc4336 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -2,7 +2,7 @@ HAProxy Configuration Manual ---------------------- - version 2.1 + version 2.2 willy tarreau 2019/11/25 diff --git a/doc/intro.txt b/doc/intro.txt index 4eaf18ef9..48a3bfa35 100644 --- a/doc/intro.txt +++ b/doc/intro.txt @@ -1,7 +1,7 @@ ----------------------- HAProxy Starter Guide ----------------------- - version 2.1 + version 2.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 fb81ed953..1d66f5249 100644 --- a/doc/management.txt +++ b/doc/management.txt @@ -1,7 +1,7 @@ ------------------------ HAProxy Management Guide ------------------------ - version 2.1 + version 2.2 This document describes how to start, stop, manage, and troubleshoot HAProxy, diff --git a/include/common/version.h b/include/common/version.h index 748d2be4a..2bf1ce00a 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.1" +#define PRODUCT_BRANCH "2.2" #endif #ifdef CONFIG_PRODUCT_STATUS