2.1 merge

diff --git a/ChangeLog b/ChangeLog
index 153efe11bd7c61fa13df0478e4e0e5a9b8286159..2e86f708d6926653653d32aa2ed070dd36ec628f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -76,6 +76,8 @@ Changes to Squid-2.1 ():
          authentication.  It is also possible to do automatic login to
          certain servers by using a redirector to add the needed
          authentication information.  (Henrik Nordstrom)
+       - Changed refreshCheck() so that objects with negative age
+         are always stale.
 
 Changes to Squid-2.0 (October 2, 1998):