From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 26 Apr 2017 12:03:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'mariner/master'
X-Git-Tag: archive/debian/6.0.0~14
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=2ffa24be9b1675155606f6ccf3d056da106a58d3

Merge remote-tracking branch 'mariner/master'
---

2ffa24be9b1675155606f6ccf3d056da106a58d3
diff --cc debian/changelog
index 17463aa,4e34480..1611b80
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,11 +1,23 @@@
 -chiark-utils (5.0.1~citrix1) unstable; urgency=medium
++chiark-utils (5.0.3~) unstable; urgency=medium
+ 
 -  * with-lock-ex: provide -l
+   * git-cache-proxy: Do not spuriously timeout on too many simultaneous
+     invocations (specifically, do not timeout when reacquiring the lock
+     before serving).
+ 
 - -- Ian Jackson <ian.jackson@eu.citrix.com>  Wed, 26 Apr 2017 12:56:02 +0100
++ -- 
++
 +chiark-utils (5.0.2) unstable; urgency=medium
 +
 +  * Portability fix: Fix on libcs where st_mtime is not a macro
 +    (ie, ones lacking st_mtim.)
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 23 Jan 2017 18:12:52 +0000
 +
 +chiark-utils (5.0.1) unstable; urgency=medium
 +
 +  * with-lock-ex: provide -l
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 23 Jan 2017 17:53:50 +0000
  
  chiark-utils (5.0.0) unstable; urgency=medium