aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application
diff options
context:
space:
mode:
authorEric Hartmann <hartmann.eric@gmail.com>2017-08-11 18:20:10 +0200
committerEric Hartmann <hartmann.eric@gmail.com>2017-08-11 18:20:10 +0200
commitfc5ab6a4ccbebc9fd5d04b30109629a679a9a4b6 (patch)
tree2e6226bf1b0ae7ae9ce50fa74486248544ecd7ab /sonar-application
parentee1c192ab4f9bb53f8089abf277cc0a81c24361b (diff)
downloadsonarqube-fc5ab6a4ccbebc9fd5d04b30109629a679a9a4b6.tar.gz
sonarqube-fc5ab6a4ccbebc9fd5d04b30109629a679a9a4b6.zip
SONAR-8798 Fix sonar.properties default values
Diffstat (limited to 'sonar-application')
-rw-r--r--sonar-application/src/main/assembly/conf/sonar.properties4
-rw-r--r--sonar-application/src/main/assembly/elasticsearch/config/jvm.options4
2 files changed, 4 insertions, 4 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 5b5c6e054ec..65a74e228ff 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -187,8 +187,8 @@
# It is executed in a dedicated Java process. Default heap size is 2Gb.
# JVM options of Elasticsearch process
-#sonar.search.javaOpts=-Xms2g \
-# -Xmx2g \
+#sonar.search.javaOpts=-Xms1g \
+# -Xmx1g \
# -XX:+UseConcMarkSweepGC \
# -XX:CMSInitiatingOccupancyFraction=75 \
# -XX:+UseCMSInitiatingOccupancyOnly \
diff --git a/sonar-application/src/main/assembly/elasticsearch/config/jvm.options b/sonar-application/src/main/assembly/elasticsearch/config/jvm.options
index 0ddb578ce1c..968a6a6a5cc 100644
--- a/sonar-application/src/main/assembly/elasticsearch/config/jvm.options
+++ b/sonar-application/src/main/assembly/elasticsearch/config/jvm.options
@@ -19,8 +19,8 @@
# Xms represents the initial size of total heap space
# Xmx represents the maximum size of total heap space
--Xms2g
--Xmx2g
+-Xms1g
+-Xmx1g
################################################################
## Expert settings