diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-04-18 14:43:23 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-04-18 14:43:23 +0200 |
| commit | d5ec15c8d04dd7f537ab3415446c01f4d42f7a77 (patch) | |
| tree | ee68ed697160c01a7d31a6834665411464ef7cc1 /org.eclipse.jgit/.settings | |
| parent | 534ede2d8143093110ff9f20ff9b510c690db8d1 (diff) | |
| parent | fad5cf8b2372fba09d18c5b9efc55a85d0bf9664 (diff) | |
| download | jgit-d5ec15c8d04dd7f537ab3415446c01f4d42f7a77.tar.gz jgit-d5ec15c8d04dd7f537ab3415446c01f4d42f7a77.zip | |
Merge branch 'stable-4.8' into stable-4.9
* stable-4.8:
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: Idaa789e699f1ef568ea957184d0641355d9e3181
Diffstat (limited to 'org.eclipse.jgit/.settings')
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 379d76f4b3..1630c3fcdd 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="4.9.8"/> + <message_argument value="4.9.10"/> <message_argument value="4.9.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/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants"> <filter id="336658481"> <message_arguments> |