update

diff --git a/ChangeLog b/ChangeLog
index 06a1251f508a78c65dd37d66d7c96428aecabf99..269bd3cfba2eaa5859e6703a13a3383d949703ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+       - Added NAT/Transparent hijacking code from Quinton Dolan.
+       - Added actual filesystem usage to cachemgr 'storedir' page.
+         Only works for some operating systems.
+
+Changes to squid-1.2.beta25 (September 21, 1998):
+
        - Fixed async IO bugs from adding filedescriptor arg to AIOCB
          callbacks (Henrik Nordstrom).
        - Fixed store_swapout.c assertion.  We were freeing object data