[RELEASE] Released version 1.7-dev0

Released version 1.7-dev0 with the following main changes :
    - exact copy of 1.6.0

diff --git a/CHANGELOG b/CHANGELOG
index c9ec50045781d2e393a2e1812b106d5c044ceb09..f756e166e89fe3358e771d816087cef83e67f060 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 ChangeLog :
 ===========
 
+2015/10/13 : 1.7-dev0
+    - exact copy of 1.6.0
+
 2015/10/13 : 1.6.0
     - BUG/MINOR: Handle interactive mode in cli handler
     - DOC: global section missing parameters

diff --git a/README b/README
index a2b6dc8ae26ee483e7f7274f60d7ca9a92136ac9..cf976057bc87e5250d39d1fb55d457eb88edfa4d 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
                          ----------------------
                              HAProxy how-to
                          ----------------------
-                             version 1.6.0
+                               version 1.7
                              willy tarreau
                                2015/10/13
 
@@ -9,12 +9,11 @@
 1) How to build it
 ------------------
 
-This version is a stable version, which means that it belongs to a branch which
-will get some fixes for bugs as they are discovered. Versions which include the
-suffix "-dev" are development versions and should be avoided in production. If
-you are not used to build from sources or if you are not used to follow updates
-then it is recommended that instead you use the packages provided by your
-software vendor or Linux distribution. Most of them are taking this task
+This is a development version, so it is expected to break from time to time,
+to add and remove features without prior notification and it should not be used
+in production. If you are not used to build from sources or if you are not used
+to follow updates then it is recommended that instead you use the packages provided
+by your software vendor or Linux distribution. Most of them are taking this task
 seriously and are doing a good job at backporting important fixes. If for any
 reason you'd prefer a different version than the one packaged for your system,
 you want to be certain to have all the fixes or to get some commercial support,

diff --git a/VERSION b/VERSION
index dc1e644a1014338ad0ca67b5c0bfbd2402e761ee..8d2557543b76e5890d4d05e1c5cd84b0409078f7 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.0
+1.7-dev0

diff --git a/doc/configuration.txt b/doc/configuration.txt
index b509238474c66e911f3e35e5e982b20940f0cefe..0333d3b3f3966fe6520f3f334401a010fecac3cb 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,7 +2,7 @@
                                 HAProxy
                           Configuration Manual
                          ----------------------
-                              version 1.6
+                              version 1.7
                              willy tarreau
                               2015/10/13
 

diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index d178ba9c45194a524db4b91e93a37fb6f8fa1c24..b8b5ca64841ddcb5f6d4ea506d3afa782bbc10e6 100644 (file)
--- a/examples/haproxy.spec
+++ b/examples/haproxy.spec
@@ -1,6 +1,6 @@
 Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 Name: haproxy
-Version: 1.6.0
+Version: 1.7-dev0
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -76,6 +76,9 @@ fi
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Tue Oct 13 2015 Willy Tarreau <w@1wt.eu>
+- updated to 1.7-dev0
+
 * Tue Oct 13 2015 Willy Tarreau <w@1wt.eu>
 - updated to 1.6.0