From: Russ Allbery <rra@debian.org>
Date: Tue, 4 May 2010 21:32:21 +0000 (-0700)
Subject: Add changelog for upstream cherry-picks
X-Git-Tag: debian/1.4.12+dfsg-4~8
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=0351482f83d55ba95a4f717e64a020fae028e121;p=packages%2Fo%2Fopenafs.git

Add changelog for upstream cherry-picks
---

diff --git a/debian/changelog b/debian/changelog
index 83530f340..e21d50904 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 openafs (1.4.12+dfsg-4) UNRELEASED; urgency=low
 
+  * Apply upstream deltas:
+    - [a2701509] Linux: don't count pag keys against root's keyring quotas
+    - [3c1d60a1] VOL_LOCK needed when traversing DiskPartitionList
+    - [89193695] Adjust afs_lockctl for byte-range lock fixes
+    - [0bec77e1] Don't ignore error code from session keyring creation
   * Preserve the AFS mount point and cache directorys set in
     /etc/openafs/cacheinfo if the file already exists rather than
     overwriting them with the defaults.  Thanks, Liam Healy.