]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.2' into stable-5.3 40/148240/2
authorMatthias Sohn <matthias.sohn@sap.com>
Fri, 23 Aug 2019 14:52:03 +0000 (16:52 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Fri, 23 Aug 2019 15:00:11 +0000 (17:00 +0200)
* stable-5.2:
  Prepare 5.1.11-SNAPSHOT builds
  JGit v5.1.10.201908230655-r
  Use AtomicReferences to cache user and system level configs
  Fix copy-paste typo in CloneCommand#cleanup

Change-Id: I3ababc0f9b540cf1785925395d32a85d30aed40d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
org.eclipse.jgit.lfs.server/.settings/.api_filters
org.eclipse.jgit.lfs/.settings/.api_filters
org.eclipse.jgit/.settings/.api_filters
org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java
org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java

index 72beb7cdfa9c56de2d41bd5da77365ad3f752b8a,3e60680cf74b08ad6b72c1af2daff71be29b9226..45fbf3b8c1968e4749eb27b7bff4713707f4c6e3
@@@ -3,8 -3,8 +3,8 @@@
      <resource path="META-INF/MANIFEST.MF">
          <filter id="924844039">
              <message_arguments>
-                 <message_argument value="5.3.3"/>
 -                <message_argument value="5.2.3"/>
 -                <message_argument value="5.2.0"/>
++                <message_argument value="5.3.4"/>
 +                <message_argument value="5.3.0"/>
              </message_arguments>
          </filter>
      </resource>
index 371f35376d8292919a974edd5aafbd2acb665bc6,95a45574ec8126bf3c650fb6da0da9c52ea6e831..47219799bec8aa3fe1a4e73c9be9a58c168731a7
@@@ -3,8 -3,8 +3,8 @@@
      <resource path="META-INF/MANIFEST.MF">
          <filter id="924844039">
              <message_arguments>
-                 <message_argument value="5.3.3"/>
 -                <message_argument value="5.2.3"/>
 -                <message_argument value="5.2.0"/>
++                <message_argument value="5.3.4"/>
 +                <message_argument value="5.3.0"/>
              </message_arguments>
          </filter>
      </resource>
index bb37dd8c8a3dbeb58d9b55c490650effff5834db,cfc68662f0f35014ef04dbeb6ab543035fd44105..686fb21812f1a5e5db6525161ae3facb2c9c6db9
@@@ -3,8 -3,8 +3,8 @@@
      <resource path="META-INF/MANIFEST.MF">
          <filter id="924844039">
              <message_arguments>
-                 <message_argument value="5.3.3"/>
 -                <message_argument value="5.2.3"/>
 -                <message_argument value="5.2.0"/>
++                <message_argument value="5.3.4"/>
 +                <message_argument value="5.3.0"/>
              </message_arguments>
          </filter>
      </resource>