From: Willy Tarreau <w@1wt.eu>
Date: Mon, 25 Nov 2019 19:36:16 +0000 (+0100)
Subject: [RELEASE] Released version 2.2-dev0
X-Git-Tag: v2.2-dev0^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e077f8d5381279a4fb242d9855e789325edead3;p=thirdparty%2Fhaproxy.git

[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 3cf2275914..774bbe6b22 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 7ec1d6db40..cb365cce91 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0
+2.2-dev0
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 7e5ecd8817..2fadc43361 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 4eaf18ef9d..48a3bfa35b 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 fb81ed953e..1d66f52494 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 748d2be4a8..2bf1ce00aa 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