From: Russ Allbery <rra@debian.org>
Date: Tue, 15 Sep 2009 00:48:35 +0000 (-0700)
Subject: Add changelog for additional upstream deltas
X-Git-Tag: debian/1.4.11+dfsg-3~4
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c2ed9dac628639cbc66c8e4704c18a3ffc3fdd0d;p=packages%2Fo%2Fopenafs.git

Add changelog for additional upstream deltas
---

diff --git a/debian/changelog b/debian/changelog
index 98e920098..e33660125 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 openafs (1.4.11+dfsg-3) UNRELEASED; urgency=low
 
+  * Apply upstream deltas:
+    - master/fileserver-retry-registeraddrs-20090810: retry
+      VL_RegisterAddrs in the file server on failure.
+    - openafs-stable-1_4_x/kernel-init-vrequest-structure-20090914:
+      properly initialize vrequest structure in the kernel.
   * Change the permissions of /var/lib/openafs/local to 0700 to match
     upstream defaults.  This directory contains the fssync.sock file used
     for coordination between the fileserver and the volserver, and