diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-09-09 15:44:44 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-09-09 15:44:44 +0200 |
| commit | 0d4e04c575ec81741599b1679ec2968dd2a37b93 (patch) | |
| tree | 4f19ec2418a59ee19d7cb5ad80fa0add974e092c | |
| parent | 5a583ef39357bde7700882f6d6ad72a8f3af8603 (diff) | |
| parent | 8f464883855240bf3ac80d792fa64dc56ea2674a (diff) | |
| download | jgit-0d4e04c575ec81741599b1679ec2968dd2a37b93.tar.gz jgit-0d4e04c575ec81741599b1679ec2968dd2a37b93.zip | |
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>
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 48051e14fb..e6e3309225 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -11,7 +11,7 @@ <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants"> <filter id="1141899266"> <message_arguments> - <message_argument value="4.8"/> + <message_argument value="4.7"/> <message_argument value="4.11"/> <message_argument value="LOCK_SUFFIX"/> </message_arguments> diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java index fe9f8e9073..10abd9eaf9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -691,7 +691,7 @@ public final class Constants { /** * Suffix of lock file name * - * @since 4.8 + * @since 4.7 */ public static final String LOCK_SUFFIX = ".lock"; //$NON-NLS-1$ |