[DEV] open new 1.6 development branch

This new branch is based on 1.5.0, which 1.6-dev0 is 100% equivalent to.
The README has been updated to mention that it is a development branch.

Released version 1.6-dev0 with the following main changes :
    - exact copy of 1.5.0

diff --git a/CHANGELOG b/CHANGELOG
index a89362755f58531c385f297519f6db6b32b90912..f17e6809c2040a4d84b72763079e80f8570fe7e1 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 ChangeLog :
 ===========
 
+2014/06/19 : 1.6-dev0
+    - exact copy of 1.5.0
+
 2014/06/19 : 1.5.0
     - MEDIUM: ssl: ignored file names ending as '.issuer' or '.ocsp'.
     - MEDIUM: ssl: basic OCSP stapling support.

diff --git a/README b/README
index 424a1f8e24c22fb61fe32de9b51930f8927615dd..bf9e82b18a921ece9672e613f4794f3158beb8d8 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
                          ----------------------
                              HAProxy how-to
                          ----------------------
-                               version 1.5
+                             version 1.6-dev
                              willy tarreau
                                2014/06/19
 
@@ -9,12 +9,14 @@
 1) How to build it
 ------------------
 
-First, please note that this version is a stable version, so in general if you
-are not used to build from sources, it is recommended that instead you follow
-the packaged updates provided by your software vendor or Linux distribution.
-Most of them are taking this task seriously and are doing a good job. If for
-any reason you'd prefer a different version than the one packaged for your
-system, or to get some commercial support, other choices are available at :
+First, please note that this version is a development version, so in general if
+you are not used to build from sources or if you don't have the time to track
+very frequent updates, it is recommended that instead you switch to the stable
+version (1.5) or follow the packaged updates provided by your software vendor
+or Linux distribution. Most of them are taking this task seriously and are
+doing a good job. If for any reason you'd prefer a different version than the
+one packaged for your system, or to get some commercial support, other choices
+are available at :
 
                         http://www.haproxy.com/
 

diff --git a/VERSION b/VERSION
index bc80560fad66ca670bdfbd1e5c973a024d4d0325..0b9d9eda8cd914bb050a978cf9de9480e70e47ab 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.0
+1.6-dev0

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 5ee2ae880d4f127b4be20696d2efa59c25d70aea..5f8067414552147ccb6b33a3adefa347826571e4 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,7 +2,7 @@
                                 HAProxy
                           Configuration Manual
                          ----------------------
-                              version 1.5
+                              version 1.6
                              willy tarreau
                               2014/06/19
 

diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 677ee0a04aa2b7edd5ab712983c2bbeaa60399d5..a22e7ea04ea23487a6b703f7642812948e985132 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.5.0
+Version: 1.6-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
+* Thu Jun 19 2014 Willy Tarreau <w@1wt.eu>
+- updated to 1.6-dev0
+
 * Thu Jun 19 2014 Willy Tarreau <w@1wt.eu>
 - updated to 1.5.0