diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-03 15:54:54 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-03 15:59:39 +0200 |
commit | c31879ac4e92110bfaa13285ebd76968d5b30894 (patch) | |
tree | f504c925ac488ffa08e45bfff3687b4378786142 /org.eclipse.jgit.ui/.settings | |
parent | 710d00b85e9419c7feaed71a1945351dab486f71 (diff) | |
parent | 261881055d42b34def764ffb99898665ba0bc6a7 (diff) | |
download | jgit-stable-5.0.tar.gz jgit-stable-5.0.zip |
Merge branch 'stable-4.11' into stable-5.0stable-5.0
* stable-4.11:
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: Ifb6a4dbea2f48fd2ffa66eb737d61920aefedfbd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.ui/.settings')
-rw-r--r-- | org.eclipse.jgit.ui/.settings/.api_filters | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/org.eclipse.jgit.ui/.settings/.api_filters b/org.eclipse.jgit.ui/.settings/.api_filters new file mode 100644 index 0000000000..b4788bacdf --- /dev/null +++ b/org.eclipse.jgit.ui/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.jgit.ui" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="925892614"> + <message_arguments> + <message_argument value="5.0.4"/> + <message_argument value="4.11.0"/> + </message_arguments> + </filter> + </resource> +</component> |