Prep for STABLE7

diff --git a/ChangeLog b/ChangeLog
index ffb66aa2241a91e1cd45d884e051d0a1f5d3e08e..cd9a56d4c7fd1cd55085c75ec764756b6961cb9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
-Changes to squid-3.0.STABLE6 (current) :
+Changes to squid-3.0.STABLE7 (22 Jun 2008):
 
-       - Fixed round-robin algorithms
+       - Fix several ASN issues
+       - Fix SNMP reporting of counters
+       - Fix round-robin algorithms
        - GCC 4.3 support
+       - Netfilter v1.4.0 bug workaround
        - Bugs 2350 and 2323: memory issues
+       - Bugs 2384, 951, 1566: ESI assertions
        - Various minor debug and documentation cleanups
 
 Changes to squid-3.0.STABLE6 (20 May 2008):

diff --git a/configure.in b/configure.in
index 0ffdca7029679f6dce79fba0582609d668acaa2f..55079d5a3e493158ca38f4bc6fd5cfeb4ae9d5b1 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl  $Id: configure.in,v 1.488.2.3 2008/03/04 12:17:04 amosjeffries Exp $
 dnl
 dnl
 dnl
-AC_INIT(Squid Web Proxy, 3.0.STABLE6-BZR, http://www.squid-cache.org/bugs/, squid)
+AC_INIT(Squid Web Proxy, 3.0.STABLE7-BZR, http://www.squid-cache.org/bugs/, squid)
 AC_PREREQ(2.52)
 AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)

diff --git a/doc/release-notes/release-3.0.sgml b/doc/release-notes/release-3.0.sgml
index bbcad98ffcaf0598a67b24945067439d2219369a..36f86e368a2e61f314cd3d66c1d124fdb79da4e3 100644 (file)
--- a/doc/release-notes/release-3.0.sgml
+++ b/doc/release-notes/release-3.0.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.0.STABLE6 release notes</title>
+<title>Squid 3.0.STABLE7 release notes</title>
 <author>Squid Developers</author>
 <date>$Id: release-3.0.sgml,v 1.30.2.5 2008/02/28 00:26:31 amosjeffries Exp $</date>
 
@@ -14,7 +14,7 @@ for Applied Network Research and members of the Web Caching community.
 
 <sect>Notice
 <p>
-The Squid Team are pleased to announce the release of Squid-3.0.STABLE6.
+The Squid Team are pleased to announce the release of Squid-3.0.STABLE7.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.0/"> or the <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.