From 5871f8e9bff2a1c1f2b4fb8bc1b9a1feac6cfd43 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Sun, 7 Jan 2007 02:47:01 +0100
Subject: [PATCH] [RELEASE] Released 1.3.5 with the following major changes :

    - added complete support and doc for TCP Splicing
    - replaced the wait-queue linked list with an rbtree.
    - stats: swap color sets for active and backup servers
    - try to guess server check port when unset
    - a few bugfixes and cleanups
---
 CHANGELOG                   | 7 +++++++
 Makefile                    | 4 ++--
 Makefile.bsd                | 2 +-
 examples/haproxy-small.spec | 3 +++
 examples/haproxy.spec       | 5 ++++-
 include/common/version.h    | 4 ++--
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 50d8a3759..46cf985a9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,13 @@
 ChangeLog :
 ===========
 
+2007/01/07 : 1.3.5
+    - stats: swap color sets for active and backup servers
+    - try to guess server check port when unset
+    - added complete support and doc for TCP Splicing
+    - replace the wait-queue linked list with an rbtree.
+    - a few bugfixes and cleanups
+
 2007/01/02 : 1.3.4
     - support for cttproxy on the server side to present the client
       address to the server.
diff --git a/Makefile b/Makefile
index 1d89457d3..f8285d0d4 100644
--- a/Makefile
+++ b/Makefile
@@ -110,9 +110,9 @@ VERDATE := $(shell date +%Y/%m/%d -d "$$(git-log HEAD^.. 2>/dev/null | grep -m 1
 else
 # Otherwise, use the hard-coded version of last tag, number of changes
 # since last tag, and release date.
-VERSION := 1.3.4
+VERSION := 1.3.5
 SUBVERS := 
-VERDATE := 2007/01/02
+VERDATE := 2007/01/07
 endif
 
 #### build options
diff --git a/Makefile.bsd b/Makefile.bsd
index 40229fab1..0c7124b8b 100644
--- a/Makefile.bsd
+++ b/Makefile.bsd
@@ -2,7 +2,7 @@
 # You should use it this way :
 #   make TARGET=os CPU=cpu
 
-VERSION := 1.3.4
+VERSION := 1.3.5
 
 # Select target OS. TARGET must match a system for which COPTS and LIBS are
 # correctly defined below.
diff --git a/examples/haproxy-small.spec b/examples/haproxy-small.spec
index df686fb8a..f41a389ae 100644
--- a/examples/haproxy-small.spec
+++ b/examples/haproxy-small.spec
@@ -69,6 +69,9 @@ fi
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Wed Jan 07 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.5
+
 * Wed Jan 02 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.4
 
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 146c75442..802aedbf8 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.4
+Version: 1.3.5
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -71,6 +71,9 @@ fi
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Wed Jan 07 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.5
+
 * Wed Jan 02 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.4
 
diff --git a/include/common/version.h b/include/common/version.h
index a86882ee5..f2b4ff147 100644
--- a/include/common/version.h
+++ b/include/common/version.h
@@ -57,13 +57,13 @@
 #ifdef CONFIG_HAPROXY_VERSION
 #define HAPROXY_VERSION CONFIG_HAPROXY_VERSION
 #else
-#define HAPROXY_VERSION "1.3.4"
+#define HAPROXY_VERSION "1.3.5"
 #endif
 
 #ifdef CONFIG_HAPROXY_DATE
 #define HAPROXY_DATE    CONFIG_HAPROXY_DATE
 #else
-#define HAPROXY_DATE    "2007/01/02"
+#define HAPROXY_DATE    "2007/01/07"
 #endif
 
 #endif /* _COMMON_VERSION_H */