From: Willy Tarreau <w@1wt.eu>
Date: Tue, 9 Jun 2009 09:59:08 +0000 (+0200)
Subject: [DEV] open new 1.4 development branch
X-Git-Tag: v1.4-dev0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=791588858e80c42d99478e2441296950647f2a8e;p=thirdparty%2Fhaproxy.git

[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 1ce97c43db..36447d2810 100644
--- 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 09d6e25cea..b22713fbea 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1 +1 @@
-2009/05/10
+2009/06/09
diff --git a/VERSION b/VERSION
index 9181bf7976..d5cc68c405 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.18
+1.4-dev0
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 6e7bd3a657..f76483a9f7 100644
--- 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 5421c78040..2a06cf7747 100644
--- 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