From: Matthias Sohn <matthias.sohn@sap.com>
Date: Fri, 20 Jun 2014 23:28:55 +0000 (+0200)
Subject: Merge branch 'stable-3.4'
X-Git-Tag: v3.5.0.201409071800-rc1~93
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=64dde09b8524a92230bacd93b2bb86e4ceab741f;p=jgit.git

Merge branch 'stable-3.4'

* stable-3.4:
  Prepare 3.4.2-SNAPSHOT builds
  JGit v3.4.1.201406201815-r
  Allow retrying connecting SshSession in case of an exception

Change-Id: I7efb009b9e012637a16c57e2e93e074023b8e46c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---

64dde09b8524a92230bacd93b2bb86e4ceab741f
diff --cc org.eclipse.jgit/.settings/.api_filters
index 0000000000,56c9ee68a0..0b8473e719
mode 000000,100644..100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -1,0 -1,25 +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 id="923795461">
 -            <message_arguments>
 -                <message_argument value="3.3.0"/>
 -                <message_argument value="3.2.0"/>
 -            </message_arguments>
 -        </filter>
+         <filter comment="minor addition" id="924844039">
+             <message_arguments>
+                 <message_argument value="3.4.0"/>
+                 <message_argument value="3.4.0"/>
+             </message_arguments>
+         </filter>
+     </resource>
 -    <resource path="src/org/eclipse/jgit/transport/TransportHttp.java" type="org.eclipse.jgit.transport.TransportHttp">
 -        <filter comment="Method is only used by implementers of TransportHttp's API, minor version are allowed to break implementer API according to OSGi semantic versioning (http://www.osgi.org/wiki/uploads/Links/SemanticVersioning.pdf)" id="338792546">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.TransportHttp"/>
 -                <message_argument value="httpOpen(String, URL)"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
+ </component>