diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-04-16 23:53:21 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-04-16 23:53:21 +0200 |
| commit | b23735107bb6af0413855e64f6eb9fe946a8f659 (patch) | |
| tree | 621699485f132fff5005c83238c1d6932ffb8921 /org.eclipse.jgit/.settings | |
| parent | 317d747c5c51a0690399ba452975cd0b2363658a (diff) | |
| parent | 422f030d29e24d4505cdb82241d0933652d06ba6 (diff) | |
| download | jgit-b23735107bb6af0413855e64f6eb9fe946a8f659.tar.gz jgit-b23735107bb6af0413855e64f6eb9fe946a8f659.zip | |
Merge branch 'stable-4.6' into stable-4.7
* stable-4.6:
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: I6ea51dde6608a4163d681aa1ebf710f06da44b21
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
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 9fa97b4e25..ef81a33f49 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.7.8"/> + <message_argument value="4.7.9"/> <message_argument value="4.7.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> |