diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-09-09 15:43:04 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-09-09 15:43:04 +0200 |
| commit | 8f464883855240bf3ac80d792fa64dc56ea2674a (patch) | |
| tree | db2e24c6690b753236ad164298c52c1cc53d923b | |
| parent | 9e26cb106fad40f26056f91e352f40239eacb213 (diff) | |
| parent | de0a6879484e1a31dee4ccc5ad2ca9856d6b0746 (diff) | |
| download | jgit-8f464883855240bf3ac80d792fa64dc56ea2674a.tar.gz jgit-8f464883855240bf3ac80d792fa64dc56ea2674a.zip | |
Merge branch 'stable-4.9' into stable-4.10
* stable-4.9:
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: I78099d2a5ba895273ca3ac587c7aa5f3f43fe869
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 5f02259a28..fdc1efc6ed 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.10"/> <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 205cf4aec3..dad5871dcf 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -684,7 +684,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$ |