diff --git a/CHANGELOG b/CHANGELOG index 723fce410..f6cb9ac16 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ ChangeLog : =========== +2007/05/14 : 1.3.11.2 + - fixed broken health-checks since switch to timeval + 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 diff --git a/Makefile b/Makefile index 60b9f134e..003d9c405 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.1 +VERSION := 1.3.11.2 SUBVERS := VERDATE := 2007/05/14 endif diff --git a/Makefile.bsd b/Makefile.bsd index 56c480f66..e4024b327 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.1 +VERSION := 1.3.11.2 # 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 c739278db..2b9fe1bba 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.1 +VERSION := 1.3.11.2 # 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 f40198061..dbe8adc05 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.1 +Version: 1.3.11.2 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.2 + * Mon May 14 2007 Willy Tarreau - updated to 1.3.11.1 diff --git a/examples/haproxy.spec b/examples/haproxy.spec index b37703bdd..004e00372 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.1 +Version: 1.3.11.2 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.2 + * Mon May 14 2007 Willy Tarreau - updated to 1.3.11.1 diff --git a/include/common/version.h b/include/common/version.h index 244b1f38f..7851fea58 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.1" +#define HAPROXY_VERSION "1.3.11.2" #endif #ifdef CONFIG_HAPROXY_DATE