diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-03 16:02:44 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-03 17:40:19 +0200 |
commit | 7aec793266065435fc51fc6ee491290a4ae86e97 (patch) | |
tree | 8ca5dc3c7fd2c72837a94b09ec37db4046ab6081 /org.eclipse.jgit.lfs.server | |
parent | af0296b42c150cf2191e2279cb50cfec8ff8a270 (diff) | |
parent | c31879ac4e92110bfaa13285ebd76968d5b30894 (diff) | |
download | jgit-7aec793266065435fc51fc6ee491290a4ae86e97.tar.gz jgit-7aec793266065435fc51fc6ee491290a4ae86e97.zip |
Merge branch 'stable-5.0' into stable-5.1
* stable-5.0:
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: I172136a031ff0730e575327cafb3527c9650a71d
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_filters | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/org.eclipse.jgit.lfs.server/.settings/.api_filters b/org.eclipse.jgit.lfs.server/.settings/.api_filters index adf3b1762a..6609c3d40d 100644 --- a/org.eclipse.jgit.lfs.server/.settings/.api_filters +++ b/org.eclipse.jgit.lfs.server/.settings/.api_filters @@ -1,13 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.jgit.lfs.server" version="2"> - <resource path="META-INF/MANIFEST.MF"> - <filter id="924844039"> - <message_arguments> - <message_argument value="5.1.11"/> - <message_argument value="5.1.0"/> - </message_arguments> - </filter> - </resource> <resource path="src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java" type="org.eclipse.jgit.lfs.server.fs.ObjectUploadListener"> <filter id="1142947843"> <message_arguments> |