diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2017-09-11 16:41:27 +0200 |
|---|---|---|
| committer | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2017-09-19 10:24:01 +0200 |
| commit | a7a788a9d1f340b35a7248a886948487524b66c1 (patch) | |
| tree | 844958cd7cba2216de2a0a668e376fbadcbf1949 /server/sonar-process | |
| parent | d8c9b99b1aec0aca512bc68ae26b8ce2e09b24cf (diff) | |
| download | sonarqube-a7a788a9d1f340b35a7248a886948487524b66c1.tar.gz sonarqube-a7a788a9d1f340b35a7248a886948487524b66c1.zip | |
SONAR-9773 improve warning message in generated ES jvm.options file
Diffstat (limited to 'server/sonar-process')
| -rw-r--r-- | server/sonar-process/src/main/java/org/sonar/process/jmvoptions/EsJvmOptions.java | 2 | ||||
| -rw-r--r-- | server/sonar-process/src/test/java/org/sonar/process/jmvoptions/EsJvmOptionsTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/sonar-process/src/main/java/org/sonar/process/jmvoptions/EsJvmOptions.java b/server/sonar-process/src/main/java/org/sonar/process/jmvoptions/EsJvmOptions.java index 61760016d2e..eddf98b4ef0 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/jmvoptions/EsJvmOptions.java +++ b/server/sonar-process/src/main/java/org/sonar/process/jmvoptions/EsJvmOptions.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; public class EsJvmOptions extends JvmOptions<EsJvmOptions> { private static final String ELASTICSEARCH_JVM_OPTIONS_HEADER = "# This file has been automatically generated by SonarQube during startup.\n" + - "# Please use the sonar.search.javaOpts in sonar.properties to specify jvm options for Elasticsearch\n" + + "# Please use sonar.search.javaOpts and/or sonar.search.javaAdditionalOpts in sonar.properties to specify jvm options for Elasticsearch\n" + "\n" + "# DO NOT EDIT THIS FILE\n" + "\n"; diff --git a/server/sonar-process/src/test/java/org/sonar/process/jmvoptions/EsJvmOptionsTest.java b/server/sonar-process/src/test/java/org/sonar/process/jmvoptions/EsJvmOptionsTest.java index 5f4ef878875..dd47b1100a6 100644 --- a/server/sonar-process/src/test/java/org/sonar/process/jmvoptions/EsJvmOptionsTest.java +++ b/server/sonar-process/src/test/java/org/sonar/process/jmvoptions/EsJvmOptionsTest.java @@ -69,7 +69,7 @@ public class EsJvmOptionsTest { assertThat(file).hasContent( "# This file has been automatically generated by SonarQube during startup.\n" + - "# Please use the sonar.search.javaOpts in sonar.properties to specify jvm options for Elasticsearch\n" + + "# Please use sonar.search.javaOpts and/or sonar.search.javaAdditionalOpts in sonar.properties to specify jvm options for Elasticsearch\n" + "\n" + "# DO NOT EDIT THIS FILE\n" + "\n" + |