Merge remote-tracking branch 'origin/master'

This commit is contained in:
David Pilato 2015-09-21 19:32:09 +02:00
commit 1f2e3d4f24
1 changed files with 2 additions and 4 deletions

View File

@ -1050,10 +1050,8 @@ encoding/<project>=UTF-8
<name>.settings/org.eclipse.jdt.core.prefs</name> <name>.settings/org.eclipse.jdt.core.prefs</name>
<content> <content>
<![CDATA[eclipse.preferences.version=1 <![CDATA[eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled # Shut down null analysis because we don't have all the required annotations (Nonnull and NonNullByDefault).
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.annotation.nullable=org.elasticsearch.common.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning