From d2058dc4913ed55d1f2123bc7ffa8176546e6c38 Mon Sep 17 00:00:00 2001 From: willy tarreau Date: Sat, 25 Mar 2006 20:35:41 +0100 Subject: [PATCH] * updated CHANGELOG and haproxy.c to display version 1.2.11 --- CHANGELOG | 15 +++++++++++++++ haproxy.c | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5e5e91e04..e1429e974 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,21 @@ ChangeLog : =========== +2006/03/25 : 1.2.11 + - added the '-db' command-line option to disable backgrounding. + - added the -sf/-st command-line arguments which are used to specify + a list of pids to send a FINISH or TERMINATE signal upon startup. + They will also be asked to release their port if a bind fails. + - reworked the startup mechanism to allow the sending of a signal to a list + of old pids if a socket cannot be bound, with a retry for a limited amount + of time (1 second by default). + - added the ability to enforce limits on memory usage. + - added the 'source' load-balancing algorithm which uses the source IP(v4|v6) + - re-architectured the server round-robin mechanism to ease integration of + other algorithms. It now relies on the number of active and backup servers. + - added a counter for the number of active and backup servers, and report + these numbers upon SIGHUP or state change. + 2006/03/23 : 1.2.10.1 - while fixing the backup server round-robin "feature", a new bug was introduced which could miss some backup servers. diff --git a/haproxy.c b/haproxy.c index daf6bbeaa..aba146171 100644 --- a/haproxy.c +++ b/haproxy.c @@ -88,11 +88,11 @@ #include "include/appsession.h" #ifndef HAPROXY_VERSION -#define HAPROXY_VERSION "1.2.10.1" +#define HAPROXY_VERSION "1.2.11" #endif #ifndef HAPROXY_DATE -#define HAPROXY_DATE "2006/03/23" +#define HAPROXY_DATE "2006/03/25" #endif /* this is for libc5 for example */