diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-09-09 09:23:51 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-09-09 09:25:54 +0200 |
| commit | f8de0596d7d6785c1354fba551667220e5204047 (patch) | |
| tree | 316b7ef2cfa008298b5acd6287b515329810a540 /org.eclipse.jgit | |
| parent | 4ce79bf738fd60691c9ec79315953e460f503a18 (diff) | |
| parent | 81735222c94069edb0e0434b717ab87011b51901 (diff) | |
| download | jgit-f8de0596d7d6785c1354fba551667220e5204047.tar.gz jgit-f8de0596d7d6785c1354fba551667220e5204047.zip | |
Merge branch 'stable-4.8' into stable-4.9
* stable-4.8:
Fix @since tag for LOCK_SUFFIX
Prepare 4.7.4-SNAPSHOT builds
JGit v4.7.3.201809090215-r
Change-Id: Id3c85149316cbe671e55f41438bd3a3a892b4ed0
Diffstat (limited to 'org.eclipse.jgit')
| -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 3299e2e57d..e9511890fd 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -26,7 +26,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.9"/> <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 688bed2616..5bfccda15c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -682,7 +682,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$ |