diff options
author | David Pursehouse <david.pursehouse@gmail.com> | 2017-03-27 10:14:50 +0900 |
---|---|---|
committer | David Pursehouse <david.pursehouse@gmail.com> | 2017-03-27 10:14:50 +0900 |
commit | 7f013924a8ec8fac49e8c0b4d30e28bc0c3f10e4 (patch) | |
tree | ad5c7520c8760af50908e7aff9d57348867157f6 /org.eclipse.jgit/.settings | |
parent | de7c1113037ce62297ad13ece5af1292b2096790 (diff) | |
parent | aaf3c5154ea3b8a367266a7be7100ad7386a84b3 (diff) | |
download | jgit-7f013924a8ec8fac49e8c0b4d30e28bc0c3f10e4.tar.gz jgit-7f013924a8ec8fac49e8c0b4d30e28bc0c3f10e4.zip |
Merge branch 'stable-4.5' into stable-4.6
* stable-4.5:
Only mark packfile invalid if exception signals permanent problem
Don't flag a packfile invalid if opening existing file failed
Prepare 4.5.2-SNAPSHOT builds
Change-Id: I20b50981adc54c426666015ff04fe3bb1db9abd9
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit/.settings')
-rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters new file mode 100644 index 0000000000..2c27b051b0 --- /dev/null +++ b/org.eclipse.jgit/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.jgit" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter comment="non-breaking addition of exception classes needed to cleanly fix error handling in PackFile" id="924844039"> + <message_arguments> + <message_argument value="4.5.2"/> + <message_argument value="4.5.0"/> + </message_arguments> + </filter> + </resource> +</component> |