* Released version 1.2.11.1

diff --git a/CHANGELOG b/CHANGELOG
index e1429e9747088b474670c1af0df926405bad1538..67e9c565405cc011a9fb1d935c06a1aea750f144 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
 ChangeLog :
 ===========
 
+2006/03/30 : 1.2.11.1
+   - under some conditions, it might have been possible that when the
+     last dead server became available, it would not have been used
+     till another one would have changed state. Could not be reproduced
+     at all, however seems possible from the code.
+
 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

diff --git a/Makefile b/Makefile
index c801524d20c172fc0ffaaf21ac74d694cf5d92a6..765c1e76f110e5fe1fd2a0d827f4057a095e5a34 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # You should use it this way :
 #   make TARGET=os CPU=cpu
 
-VERSION := 1.2.10
+VERSION := 1.2.11.1
 
 # Select target OS. TARGET must match a system for which COPTS and LIBS are
 # correctly defined below.

diff --git a/haproxy.c b/haproxy.c
index 9034392655bb9afc82e5318180aed845c526fc45..df6f5d664f20dea16cb0c5569c822bef5e3b0f63 100644 (file)
--- a/haproxy.c
+++ b/haproxy.c
@@ -88,11 +88,11 @@
 #include "include/appsession.h"
 
 #ifndef HAPROXY_VERSION
-#define HAPROXY_VERSION "1.2.11"
+#define HAPROXY_VERSION "1.2.11.1"
 #endif
 
 #ifndef HAPROXY_DATE
-#define HAPROXY_DATE   "2006/03/25"
+#define HAPROXY_DATE   "2006/03/30"
 #endif
 
 /* this is for libc5 for example */