summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/.settings
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2019-04-19 12:40:27 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2019-04-20 01:52:02 +0200
commitf33fd16425d8bbc0975d2e820ab0bc830015a48b (patch)
tree50db4ec02c29f5fd8ff50da52bc9aa1d9c7f216f /org.eclipse.jgit/.settings
parent08a5d2771d641b2f69e588ce11028d26323283aa (diff)
parent710d00b85e9419c7feaed71a1945351dab486f71 (diff)
downloadjgit-f33fd16425d8bbc0975d2e820ab0bc830015a48b.tar.gz
jgit-f33fd16425d8bbc0975d2e820ab0bc830015a48b.zip
Merge branch 'stable-5.0' into stable-5.1
* stable-5.0: Prepare 4.11.9-SNAPSHOT builds JGit v4.11.8.201904181247-r Prepare 4.9.11-SNAPSHOT builds JGit v4.9.10.201904181027-r Prepare 4.7.10-SNAPSHOT builds JGit v4.7.9.201904161809-r Prepare 4.5.8-SNAPSHOT builds JGit v4.5.7.201904151645-r Remember the cause for invalidating a packfile Fix API problem filters Fix pack files scan when filesnapshot isn't modified Change-Id: I685d8a797209bc1b9c1bb9caba40ac8713c6ce5b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/.settings')
-rw-r--r--org.eclipse.jgit/.settings/.api_filters16
1 files changed, 15 insertions, 1 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index d6944f9450..fdacadf9a1 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -3,11 +3,25 @@
<resource path="META-INF/MANIFEST.MF">
<filter id="924844039">
<message_arguments>
- <message_argument value="5.1.6"/>
+ <message_argument value="5.1.7"/>
<message_argument value="5.1.0"/>
</message_arguments>
</filter>
</resource>
+ <resource path="src/org/eclipse/jgit/errors/PackInvalidException.java" type="org.eclipse.jgit.errors.PackInvalidException">
+ <filter id="1142947843">
+ <message_arguments>
+ <message_argument value="4.5.7"/>
+ <message_argument value="PackInvalidException(File, Throwable)"/>
+ </message_arguments>
+ </filter>
+ <filter id="1142947843">
+ <message_arguments>
+ <message_argument value="4.5.7"/>
+ <message_argument value="PackInvalidException(String, Throwable)"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/jgit/lib/GitmoduleEntry.java" type="org.eclipse.jgit.lib.GitmoduleEntry">
<filter id="1109393411">
<message_arguments>