[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 3cf2275914f8496f746a06a603e0688bb0318f50..774bbe6b226bce790fc209174a7a009e27cc81a4 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 7ec1d6db40877765247db18e7f9a4e36a0def4ad..cb365cce91ea1347ebfc04c486f32b91233bcd7a 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 7e5ecd8817f6811cb401a3f2fddd7bd664042560..2fadc433611bacd9092b150d1fbde3e319a6a72e 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 4eaf18ef9d56f6b17ba7fd453cfa89516163956d..48a3bfa35bc772ce678c73c9c88c2c0234884497 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 fb81ed953e795eb6beb8b58b380cd810b809aa35..1d66f52494c97285249a94ed6880c15188f77cc6 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 748d2be4a8ad2a48cd254418c4e63b857ba6b2d3..2bf1ce00aa150922e1d06a1e82da413c277f04e0 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