Prep for 3.1.5

diff --git a/ChangeLog b/ChangeLog
index b6cdfeb3efc7a57ac84463f83b369384e87e21a2..b73336746972f981e5861f3640ada4021f01ee97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
-Changes in development:
-
-       - Bug 2950: HTTP responses with no Date, Last-modified or expired can
-         now be cached (given an appropriate refresh_pattern). Previously we
-         were not caching them in case of an infinite loop in cache farms:
-         however Squid adds Date: headers now which remove that concern.
+Changes to squid-3.1.5 (02 Jul 2010):
+
+       - Bug 2967: raw-IPv6 address URL with append_domain broken
+       - Bug 2950: HTTP responses with no Date, L-M or Expires can now be cached
+       - Bug 2943: ICAP tokens not logged when using multiple access
+       - Bug 2937: Fails to detect chunked encoding if not given in all lower case
+       - Bug 2903: does not send indirect X-Client-Ip in ICAP respmod
+       - Fix free memory corruption and off-by-on error when comparing SNMP OIDs
+       - Port from 2.7: max_filedescriptor config option
+       - Fix persistent_connection_after_error is meant to be on by default
+       - ... and several build errors.
 
 Changes to squid-3.1.4 (30 May 2010):
 

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index 93b39ffef2f994b14fdedecc68bf53b7543fd1bd..860348d2fe4c2d3a68a51980e447e9757be6a089 100644 (file)
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.1.4 release notes</title>
+<title>Squid 3.1.5 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -13,7 +13,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.1.4.
+The Squid Team are pleased to announce the release of Squid-3.1.5.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.1/"> or the <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.