Merge branch 'stable-4.10' into stable-4.11
* stable-4.10: Prepare 4.9.5-SNAPSHOT builds JGit v4.9.4.201809090327-r Fix @since tag for LOCK_SUFFIX Prepare 4.7.4-SNAPSHOT builds JGit v4.7.3.201809090215-r Change-Id: I8e962758973753fe7baffd959050593a059ee44e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
commit
0d4e04c575
|
@ -11,7 +11,7 @@
|
||||||
<resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants">
|
<resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants">
|
||||||
<filter id="1141899266">
|
<filter id="1141899266">
|
||||||
<message_arguments>
|
<message_arguments>
|
||||||
<message_argument value="4.8"/>
|
<message_argument value="4.7"/>
|
||||||
<message_argument value="4.11"/>
|
<message_argument value="4.11"/>
|
||||||
<message_argument value="LOCK_SUFFIX"/>
|
<message_argument value="LOCK_SUFFIX"/>
|
||||||
</message_arguments>
|
</message_arguments>
|
||||||
|
|
|
@ -691,7 +691,7 @@ public static byte[] encode(final String str) {
|
||||||
/**
|
/**
|
||||||
* Suffix of lock file name
|
* Suffix of lock file name
|
||||||
*
|
*
|
||||||
* @since 4.8
|
* @since 4.7
|
||||||
*/
|
*/
|
||||||
public static final String LOCK_SUFFIX = ".lock"; //$NON-NLS-1$
|
public static final String LOCK_SUFFIX = ".lock"; //$NON-NLS-1$
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue