diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-04 00:32:42 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-04 00:49:42 +0200 |
commit | 4a3cd7f1b7533d9451cd63389c6546ef312292c3 (patch) | |
tree | f428de4b615745b4b9819733ea1ebe4e081de7eb /org.eclipse.jgit.lfs | |
parent | 47a95d1aed3a2e696bfa346b9e395d4b4337dbad (diff) | |
parent | aa62f191d02c19073c22a5e33e4a07c54a67efa7 (diff) | |
download | jgit-4a3cd7f1b7533d9451cd63389c6546ef312292c3.tar.gz jgit-4a3cd7f1b7533d9451cd63389c6546ef312292c3.zip |
Merge branch 'stable-5.2' into stable-5.3
* stable-5.2:
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: I7e88c7c7d202f1e3fb8e143277650aa5fefff439
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.lfs')
-rw-r--r-- | org.eclipse.jgit.lfs/.settings/.api_filters | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/org.eclipse.jgit.lfs/.settings/.api_filters b/org.eclipse.jgit.lfs/.settings/.api_filters deleted file mode 100644 index 0bdf571d44..0000000000 --- a/org.eclipse.jgit.lfs/.settings/.api_filters +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.eclipse.jgit.lfs" version="2"> - <resource path="META-INF/MANIFEST.MF"> - <filter id="924844039"> - <message_arguments> - <message_argument value="5.3.4"/> - <message_argument value="5.3.0"/> - </message_arguments> - </filter> - <filter id="924844039"> - <message_arguments> - <message_argument value="5.3.5"/> - <message_argument value="5.3.0"/> - </message_arguments> - </filter> - </resource> -</component> |