[RELEASE] Released version 2.1-dev0

Released version 2.1-dev0 with the following main changes :
    - exact copy of 2.0.0

diff --git a/CHANGELOG b/CHANGELOG
index 68a3aca4cd7c359ac1457179c84b07145c41bf66..6b992eb4ff3f05b68695ac97c0f072d775506ea9 100644 (file)
--- 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 227cea215648b1af34a87c9acf5b707fe02d2072..77a9f8e4889031fab270161f4f835c40d1afc652 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.0
+2.1-dev0

diff --git a/doc/configuration.txt b/doc/configuration.txt
index fd06b1a8f91a61223e787f81942266b797702b03..3e402fb92ca8e9d4ef16366b1eb3f0e72fa2704c 100644 (file)
--- 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 a60844c5a0538990ae3be71675f8a698adb63449..0ee9fa2d1ab0e21e3029ff638457ff62ffeba4b4 100644 (file)
--- 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 616a040b7ddb603de9dc2d9d0737aa9d832ab536..93bee671b18577f16d311757bf7529a9f20bbf3b 100644 (file)
--- 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 305087db1227fad69d3801e6bf2b0edf66ee47f0..49427468c562f1e1bf131274d7ae608351ffe916 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.0"
+#define PRODUCT_BRANCH   "2.1"
 #endif
 
 #ifdef  CONFIG_PRODUCT_URL