update

diff --git a/ChangeLog b/ChangeLog
index c60044faa164168d6c5294755495e8d51a25c034..d39da3c5b2db2288a2313ea057cd7bc9917ea2a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Changes to Squid-2.2 ():
+
+       - @@Glenn changed lots of SNMP stuff
+       - Added our own assert() macro so we can use debug() instead of
+         printing to stderr.
+       - Added eventFreeMemory().
+       - Fixed ipcCreate() bug when debug_log has FD <= 2.
+       - Changed watchChild() and related code in main.c so that
+         Squid can behave more like a proper daemon process.
+       - Added 'prefer_direct' option (enabled by default) so that
+         people can give parents higher preference than direct.
+
 Changes to Squid-2.1 ():
 
        - Changed delayPoolsUpdate() to be called as an event.