diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-03-27 00:51:05 +0200 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2018-03-26 16:35:30 -0700 |
| commit | 10d03a77a4690d1d44a86e6650e6dacd3815a5c8 (patch) | |
| tree | 332e75ff4bbbf08d6be2e6fcdd5b62c07cec7cd3 /org.eclipse.jgit/.settings | |
| parent | 4bfc6c2ae9ec582575b05f4e63ee62212bb284a4 (diff) | |
| parent | a263bb11733de8d8113c5ad72030785bc95ebf33 (diff) | |
| download | jgit-10d03a77a4690d1d44a86e6650e6dacd3815a5c8.tar.gz jgit-10d03a77a4690d1d44a86e6650e6dacd3815a5c8.zip | |
Merge branch 'stable-4.11'
* stable-4.11:
Remove package import for javax.servlet.http from org.eclipse.jgit
Add missing @since tag and silence API error
Change-Id: I2783a15ead26ab19de31a8fb3bfb148ef19de91a
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 | 12 |
1 files changed, 12 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..3d36b880ea --- /dev/null +++ b/org.eclipse.jgit/.settings/.api_filters @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.jgit" version="2"> + <resource path="src/org/eclipse/jgit/lib/ObjectIdSerializer.java" type="org.eclipse.jgit.lib.ObjectIdSerializer"> + <filter id="1141899266"> + <message_arguments> + <message_argument value="4.11"/> + <message_argument value="5.0"/> + <message_argument value="writeWithoutMarker(OutputStream, AnyObjectId)"/> + </message_arguments> + </filter> + </resource> +</component> |