summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.lfs.server
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2019-09-04 01:28:05 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2019-09-04 01:28:15 +0200
commit7cdb01939e4107c693049e2b09b79ed8693637d5 (patch)
treedcbba4b1c7c6087952ae032f980b3c4029b6527e /org.eclipse.jgit.lfs.server
parent013f2621d03cf823967800d94e7202dbde9e00e1 (diff)
parent927ae2f55bc6e4b6a02beb2fcebf6104e1f73669 (diff)
downloadjgit-7cdb01939e4107c693049e2b09b79ed8693637d5.tar.gz
jgit-7cdb01939e4107c693049e2b09b79ed8693637d5.zip
Merge branch 'stable-5.3' into stable-5.4
* stable-5.3: Prepare 5.3.6-SNAPSHOT builds JGit v5.3.5.201909031855-r Prepare 5.1.12-SNAPSHOT builds JGit v5.1.11.201909031202-r Prepare 4.11.10-SNAPSHOT builds JGit v4.11.9.201909030838-r Bazel: Update bazlets to the latest master revision Bazel: Remove FileTreeIteratorWithTimeControl from BUILD file BatchRefUpdate: repro racy atomic update, and fix it Delete unused FileTreeIteratorWithTimeControl Fix RacyGitTests#testRacyGitDetection Change RacyGitTests to create a racy git situation in a stable way Silence API warnings Change-Id: Icfd5a612055feeff04733c0d2c44837ab554a2c4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.lfs.server')
-rw-r--r--org.eclipse.jgit.lfs.server/.settings/.api_filters19
1 files changed, 19 insertions, 0 deletions
diff --git a/org.eclipse.jgit.lfs.server/.settings/.api_filters b/org.eclipse.jgit.lfs.server/.settings/.api_filters
new file mode 100644
index 0000000000..6609c3d40d
--- /dev/null
+++ b/org.eclipse.jgit.lfs.server/.settings/.api_filters
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.jgit.lfs.server" version="2">
+ <resource path="src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java" type="org.eclipse.jgit.lfs.server.fs.ObjectUploadListener">
+ <filter id="1142947843">
+ <message_arguments>
+ <message_argument value="5.1.7"/>
+ <message_argument value="setCallback(ObjectUploadListener.Callback)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java" type="org.eclipse.jgit.lfs.server.fs.ObjectUploadListener$Callback">
+ <filter id="1142947843">
+ <message_arguments>
+ <message_argument value="5.1.7"/>
+ <message_argument value="Callback"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>