diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2018-08-29 23:20:52 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-08-29 23:21:02 +0200 |
commit | aa5007c576773cff862bfc32d8a6be10ec803e07 (patch) | |
tree | 3d88dad4a6a73ab3cd0d9e0cd0443b0a4cede2ef | |
parent | c70c51fdd1d4be8b2033b22cf7f0f4a7492462e3 (diff) | |
parent | c64de36a06ea84d68c5abe311e0ccdb11fcbfd4b (diff) | |
download | jgit-aa5007c576773cff862bfc32d8a6be10ec803e07.tar.gz jgit-aa5007c576773cff862bfc32d8a6be10ec803e07.zip |
Merge branch 'stable-5.1'
* stable-5.1:
Adjust severity of missing execution environment for LFS
Prepare 5.1.0-SNAPSHOT builds
JGit v5.1.0.201808281540-m3
Change-Id: Iebe26d872b92a347eea479a136a4a2bac726b0bb
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r-- | org.eclipse.jgit.lfs.server/.settings/org.eclipse.pde.api.tools.prefs | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.lfs/.settings/org.eclipse.pde.api.tools.prefs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit.lfs.server/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.jgit.lfs.server/.settings/org.eclipse.pde.api.tools.prefs index 112e3c3187..c0030ded71 100644 --- a/org.eclipse.jgit.lfs.server/.settings/org.eclipse.pde.api.tools.prefs +++ b/org.eclipse.jgit.lfs.server/.settings/org.eclipse.pde.api.tools.prefs @@ -81,7 +81,7 @@ METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error -MISSING_EE_DESCRIPTIONS=Error +MISSING_EE_DESCRIPTIONS=Warning TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error diff --git a/org.eclipse.jgit.lfs/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.jgit.lfs/.settings/org.eclipse.pde.api.tools.prefs index 112e3c3187..c0030ded71 100644 --- a/org.eclipse.jgit.lfs/.settings/org.eclipse.pde.api.tools.prefs +++ b/org.eclipse.jgit.lfs/.settings/org.eclipse.pde.api.tools.prefs @@ -81,7 +81,7 @@ METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error -MISSING_EE_DESCRIPTIONS=Error +MISSING_EE_DESCRIPTIONS=Warning TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error |