[DEV] open new 1.4 development branch

This new branch is based on 1.3.18, which 1.4-dev0 is 100% equivalent to.

diff --git a/CHANGELOG b/CHANGELOG
index 1ce97c43db7a5878eda6c9439cb445e16b979d96..36447d2810061cfa1c40f602341eeb08b1600135 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 ChangeLog :
 ===========
 
+2009/06/09 : 1.4-dev0
+    - exact copy of 1.3.18
+
 2009/05/10 : 1.3.18
     - [MEDIUM] add support for "balance hdr(name)"
     - [CLEANUP] give a little bit more information in error message

diff --git a/VERDATE b/VERDATE
index 09d6e25ceab1668014d5537ea80e79019cb83760..b22713fbea42d976e05a444b74b2b513a2c39e15 100644 (file)
--- a/VERDATE
+++ b/VERDATE
@@ -1 +1 @@
-2009/05/10
+2009/06/09

diff --git a/VERSION b/VERSION
index 9181bf7976adf085f4897744bce2980d5e1630f6..d5cc68c405ca9522c643d4f72932ccb718995006 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.18
+1.4-dev0

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 6e7bd3a6570adcdac9abb41ffcd8c182a4b77288..f76483a9f7956379ae44fd185070291739dd6e32 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,9 +2,9 @@
                                  HAProxy
                           Configuration Manual
                          ----------------------
-                            version 1.3.18
+                              version 1.4
                              willy tarreau
-                              2009/05/10
+                              2009/06/09
 
 
 This document covers the configuration language as implemented in the version

diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 5421c780400d4dbf9e716306eec8fe7a930aefe6..2a06cf7747b8775da6c04dd5acfe85db91ba0300 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.3.18
+Version: 1.4-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 Jun 09 2009 Willy Tarreau <w@1wt.eu>
+- updated to 1.4-dev0
+
 * Sun May 10 2009 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.18