update

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index fd1a432eaeb039a2341724eed588a747b77251a4..999a040a547e2dcd5ad331f25ad6ac0499b031d9 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -59,7 +59,7 @@ Special thanks go to people who have volunteered their time, effort, and ideas t
        Max Okumoto <okumoto@ucsd.edu>
        Pierre-Louis BRENAC <brenacp@esiee.fr>
        Dale <dale@server.ctam.bitmcnit.bryansk.su>
-
+       Masashi Fujita <objectx@bandit.co.jp>
 
 Development of this caching software is funded by the National Science
 Foundation (grant NCR-9521745).  Paid staff members on the caching
@@ -67,5 +67,6 @@ project are:
 
        Duane Wessels <wessels@nlanr.net>
        Kostas Anagnostakis <kostas@nlanr.net>
+       Alex Rousskov <rousskov@nlanr.net>
        K Claffy <kc@nlanr.net>
        Hans-Werner Braun <hwb@nlanr.net>

diff --git a/ChangeLog b/ChangeLog
index 77ac8c305f06277dc565b96ef324b90333e3670d..03d6d9b857343b1ae4fefd211c85003443391049 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+       - Combined various interprocess communication setup functions
+         into ipcCreate().
+       - Removed some leftover ICP_HIT_OBJ things.
+       - Removed cacheinfo and proto_count() and friends; these are to
+         be replaced in functionality by StatCounters and 5/60 minute
+         average views via cachemgr.
+       - Fixed --enable-acltree configure message (Masashi Fujita).
+       - Fixed no reference to @LIB_MALLOC@ in src/Makefile.in
+         (Masashi Fujita).
+       - Fixed building outside of source tree (Masashi Fujita).
+
 Changes to squid-1.2.beta12 (Jan 30, 1998):
 
        - -D_REENTRANT when linking with -lpthreads (Henrik Nordstrom)