From dca09c0cc5ce1347427480959c3beae4e67506b7 Mon Sep 17 00:00:00 2001
From: tfheen <tfheen@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Mon, 20 Oct 2008 09:03:53 +0000
Subject: [PATCH] Merge 2.0.x changes files from branches/2.0

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3327 d4fa192b-c00b-0410-8231-f00ffab90ce4
---
 varnish-cache/doc/Makefile.am           |  2 ++
 varnish-cache/doc/changes-2.0-2.0.1.xml | 29 +++++++++++++++++++++++++
 varnish-cache/doc/changes-2.0.1.xml     | 12 ++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 varnish-cache/doc/changes-2.0-2.0.1.xml
 create mode 100644 varnish-cache/doc/changes-2.0.1.xml

diff --git a/varnish-cache/doc/Makefile.am b/varnish-cache/doc/Makefile.am
index 19df6c37..ec5a8a10 100644
--- a/varnish-cache/doc/Makefile.am
+++ b/varnish-cache/doc/Makefile.am
@@ -1,6 +1,7 @@
 # $Id$
 
 CHANGELOGS = \
+	changes-2.0.1.html \
 	changes-2.0.html \
 	changes-1.1.2.html \
 	changes-1.1.1.html \
@@ -8,6 +9,7 @@ CHANGELOGS = \
 	changes-1.0.4.html
 
 XML = \
+	changes-2.0-2.0.1.xml \
 	changes-1.1.2-2.0.xml \
 	changes-1.1.1-1.1.2.xml \
 	changes-1.1-1.1.1.xml \
diff --git a/varnish-cache/doc/changes-2.0-2.0.1.xml b/varnish-cache/doc/changes-2.0-2.0.1.xml
new file mode 100644
index 00000000..39422abf
--- /dev/null
+++ b/varnish-cache/doc/changes-2.0-2.0.1.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE group [
+<!ENTITY mdash "&#8212;">
+]>
+<!-- $Id$ -->
+<group from="2.0" to="2.0.1">
+  <subsystem>
+    <name>varnishd</name>
+
+    <change type="bug" ref="354">
+      <para>When receiving a garbled HTTP
+      request, <code>varnishd</code> would sometimes crash.  This has
+      been fixed.</para>
+    </change>
+
+    <change type="bug">
+      <para>There was an off-by-one error in the ACL compilation.
+      Now fixed.</para>
+    </change>
+  </subsystem>
+
+  <subsystem>
+    <name>Red Hat spec file</name>
+
+    <change type="bug">
+      <para>A typo in the spec file made the .rpm file names wrong.</para>
+    </change>
+  </subsystem>
+</group>
diff --git a/varnish-cache/doc/changes-2.0.1.xml b/varnish-cache/doc/changes-2.0.1.xml
new file mode 100644
index 00000000..9d843988
--- /dev/null
+++ b/varnish-cache/doc/changes-2.0.1.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xml" href="changes-html.xsl"?>
+<!DOCTYPE changelog [
+ <!ENTITY mdash "&#8212;">
+]>
+<!-- $Id$ -->
+<changelog xmlns:xi="http://www.w3.org/2001/XInclude">
+  <package>Varnish</package>
+  <version>2.0.1</version>
+
+  <xi:include href="changes-2.0-2.0.1.xml"/>
+</changelog>
-- 
2.39.5