diff --git a/CHANGELOG b/CHANGELOG index 4e066ae31..782805e56 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ ChangeLog : =========== +2007/05/09 : 1.3.10.1 + - fixed sepoll transition matrix (two states were missing) + 2007/05/08 : 1.3.10 - several fixes in ev_sepoll - fixed some expiration dates on some tasks diff --git a/Makefile b/Makefile index 35d86056b..fe92938a0 100644 --- a/Makefile +++ b/Makefile @@ -120,9 +120,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.10 +VERSION := 1.3.10.1 SUBVERS := -VERDATE := 2007/05/08 +VERDATE := 2007/05/09 endif #### build options diff --git a/Makefile.bsd b/Makefile.bsd index a13e9f853..cccf294b3 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.10 +VERSION := 1.3.10.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 6d6e8662a..f98ce62c8 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.10 +VERSION := 1.3.10.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 7157b3aab..6444c036a 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.10 +Version: 1.3.10.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 +* Tue May 09 2007 Willy Tarreau +- updated to 1.3.10.1 + * Tue May 08 2007 Willy Tarreau - updated to 1.3.10 diff --git a/examples/haproxy.spec b/examples/haproxy.spec index 1f6aa7dc6..2dc25735a 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.10 +Version: 1.3.10.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 +* Tue May 09 2007 Willy Tarreau +- updated to 1.3.10.1 + * Tue May 08 2007 Willy Tarreau - updated to 1.3.10 diff --git a/include/common/version.h b/include/common/version.h index 05e6ee1be..518e9a77d 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.10" +#define HAPROXY_VERSION "1.3.10.1" #endif #ifdef CONFIG_HAPROXY_DATE #define HAPROXY_DATE CONFIG_HAPROXY_DATE #else -#define HAPROXY_DATE "2007/05/08" +#define HAPROXY_DATE "2007/05/09" #endif #endif /* _COMMON_VERSION_H */