[RELEASE] Released version 2.2-dev0

Released version 2.2-dev0 with the following main changes :
    - exact copy of 2.1.0

diff --git a/CHANGELOG b/CHANGELOG
index 3cf2275..774bbe6 100644 (file)
--- 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 7ec1d6d..cb365cc 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0
+2.2-dev0

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 7e5ecd8..2fadc43 100644 (file)
--- 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 4eaf18e..48a3bfa 100644 (file)
--- 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 fb81ed9..1d66f52 100644 (file)
--- 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 748d2be..2bf1ce0 100644 (file)
--- 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