From: Midgard <M1dgard@users.noreply.github.com>
Date: Sun, 18 Feb 2018 00:07:20 +0000 (+0100)
Subject: Put ES javaOpts arguments on one line
X-Git-Tag: 7.5~1636
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9d3f2aa4fbc7a2f458f1f81e7b100ad6ad029a95;p=sonarqube.git

Put ES javaOpts arguments on one line

Make it consistent with the two other javaOpts settings, avoiding errors due to only uncommenting one of the three lines.
---

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 3dc4e4199cf..4eba16bb859 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -207,9 +207,7 @@
 #
 
 # JVM options of Elasticsearch process
-#sonar.search.javaOpts=-Xms512m \
-# -Xmx512m \
-# -XX:+HeapDumpOnOutOfMemoryError
+#sonar.search.javaOpts=-Xms512m -Xmx512m -XX:+HeapDumpOnOutOfMemoryError
 
 # Same as previous property, but allows to not repeat all other settings like -Xmx
 #sonar.search.javaAdditionalOpts=