From 3c5340c35bfb1e4f4d1c20010e6e338eafd71a60 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 14 May 2007 03:18:43 +0200 Subject: [PATCH] [RELEASE] Released version 1.3.11.1 with the following main changes : - fixed ev_kqueue which was forgotten during the switch to timeval - allowed null timeouts for past events in select --- CHANGELOG | 4 ++++ Makefile | 2 +- Makefile.bsd | 2 +- Makefile.osx | 2 +- examples/haproxy-small.spec | 5 ++++- examples/haproxy.spec | 5 ++++- include/common/version.h | 2 +- 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c51d8da33..723fce410 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,10 @@ ChangeLog : =========== +2007/05/14 : 1.3.11.1 + - fixed ev_kqueue which was forgotten during the switch to timeval + - allowed null timeouts for past events in select + 2007/05/14 : 1.3.11 - fixed ev_sepoll again by rewriting the state machine - switched all timeouts to timevals instead of milliseconds diff --git a/Makefile b/Makefile index 37a8684f6..60b9f134e 100644 --- a/Makefile +++ b/Makefile @@ -120,7 +120,7 @@ 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.11 +VERSION := 1.3.11.1 SUBVERS := VERDATE := 2007/05/14 endif diff --git a/Makefile.bsd b/Makefile.bsd index 2d7524361..56c480f66 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.11 +VERSION := 1.3.11.1 # Select target OS. TARGET must match a system for which COPTS and LIBS are # correctly defined below. diff --git a/Makefile.osx b/Makefile.osx index 7dfc861e1..c739278db 100644 --- a/Makefile.osx +++ b/Makefile.osx @@ -2,7 +2,7 @@ # You should use it this way : # make TARGET=os CPU=cpu -VERSION := 1.3.11 +VERSION := 1.3.11.1 # 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 ae29e9c55..f40198061 100644 --- a/examples/haproxy-small.spec +++ b/examples/haproxy-small.spec @@ -1,6 +1,6 @@ Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments Name: haproxy -Version: 1.3.11 +Version: 1.3.11.1 Release: 1 License: GPL Group: System Environment/Daemons @@ -69,6 +69,9 @@ fi %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name} %changelog +* Mon May 14 2007 Willy Tarreau +- updated to 1.3.11.1 + * Mon May 14 2007 Willy Tarreau - updated to 1.3.11 diff --git a/examples/haproxy.spec b/examples/haproxy.spec index 8f8fe827c..b37703bdd 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.11 +Version: 1.3.11.1 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 +* Mon May 14 2007 Willy Tarreau +- updated to 1.3.11.1 + * Mon May 14 2007 Willy Tarreau - updated to 1.3.11 diff --git a/include/common/version.h b/include/common/version.h index 6b4280b58..244b1f38f 100644 --- a/include/common/version.h +++ b/include/common/version.h @@ -57,7 +57,7 @@ #ifdef CONFIG_HAPROXY_VERSION #define HAPROXY_VERSION CONFIG_HAPROXY_VERSION #else -#define HAPROXY_VERSION "1.3.11" +#define HAPROXY_VERSION "1.3.11.1" #endif #ifdef CONFIG_HAPROXY_DATE