1.2.alpha3

diff --git a/ChangeLog b/ChangeLog
index cd5313a7f499f59981b37412ebc3c10a5037f3fd..2bbff6a53ea3c8ef3b62b608f750b619875b64ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,21 @@
-Changes to squid-1.2.alpha1 ():
+Changes to squid-1.2.alpha3 ():
+
+       - Implemented persistent connections between clients and squid.
+       - Moved various FD tables (comm.c, fdstat.c, disk.c) to a single
+         table in fd.c.
+       - Removed use of FD as an identifier in certain callback
+         operations (ipcache, fqdncache).
+       - General code cleanup.
+       - Fixed typedefs for callback functions.
+       - Removed FD lifetime/timeout dichotomy.  Now we only have
+         timeouts, however the lifetime concept/keyword may still
+         linger in certain places.
+       - Change Makefile 'realclean' target to 'distclean'
+       - Changed config file parsing of time specifications to use
+         parseTimeLine().
+       - Removed storetoString.c
+
+Changes to squid-1.2.alpha2 ():
 
        - Merged squid-1.1.9, squid-1.1.10 changes
 

diff --git a/include/version.h b/include/version.h
index 8c4d5623900c7890ab38ddf10e6bdc942bc8412a..96d29049796e396ee52a6ca93e9ebb9ea8117dd6 100644 (file)
--- a/include/version.h
+++ b/include/version.h
@@ -1,9 +1,9 @@
-/* $Id: version.h,v 1.80 1997/04/28 05:12:02 wessels Exp $
+/* $Id: version.h,v 1.81 1997/05/14 21:08:30 wessels Exp $
  *
  *  SQUID_VERSION - String for version id of this distribution
  */
 #ifndef SQUID_VERSION
-#define SQUID_VERSION  "1.2.alpha2"
+#define SQUID_VERSION  "1.2.alpha3"
 #endif
 
 #ifndef SQUID_RELEASE_TIME