diff options
| author | Jenkins CI <ci@sonarsource.com> | 2016-05-27 10:10:42 +0200 |
|---|---|---|
| committer | Jenkins CI <ci@sonarsource.com> | 2016-05-27 10:10:42 +0200 |
| commit | b1d1599fdce122e247d8bb85ee0daa672616b4db (patch) | |
| tree | 13a20f183721d95cd1d8ac51a11f4ed19fe3abda /server/sonar-search | |
| parent | 396b9c34fc0a5e6110782d2355d169c7f40528a7 (diff) | |
| parent | 7a4e71586a11644181f593aed3b23692ba887cdc (diff) | |
| download | sonarqube-b1d1599fdce122e247d8bb85ee0daa672616b4db.tar.gz sonarqube-b1d1599fdce122e247d8bb85ee0daa672616b4db.zip | |
Automatic merge from branch-5.6
* origin/branch-5.6:
SONAR-7652 fix connection to SQL Azure
Upgrade version of java 8 on Travis
SONAR-7653 remove useless code
SONAR-7653 remove Java option XX:MaxPermSize
SONAR-7587 end of support of Java 7
Diffstat (limited to 'server/sonar-search')
| -rw-r--r-- | server/sonar-search/src/main/java/org/sonar/search/SearchServer.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java index eda960f22b3..899ab6891b8 100644 --- a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java +++ b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java @@ -36,7 +36,6 @@ public class SearchServer implements Monitored { public SearchServer(Props props) { this.settings = new EsSettings(props); new MinimumViableSystem() - .checkJavaVersion() .checkWritableTempDir(); } |