Skip to content
Browse files

Merge pull request #26 from courtenay/upstream_master

Modify JAVA_OPTS call so that it actually uses the memory/heap settings
  • Loading branch information...
2 parents e329aed + 2aa05e6 commit 909f9cafd5139d7243d85b13b0c007310b2206cd @damm damm committed Dec 30, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 cookbooks/elasticsearch/templates/default/elasticsearch.in.sh.erb
View
2 cookbooks/elasticsearch/templates/default/elasticsearch.in.sh.erb
@@ -28,7 +28,7 @@ JAVA_OPTS="$JAVA_OPTS -Djline.enabled=true"
#JAVA_OPTS="$JAVA_OPTS -XX:+UseCompressedOops"
# This stops an annoying warning
-JAVA_OPTS="-server"
+JAVA_OPTS="$JAVA_OPTS -server"
JAVA_OPTS="$JAVA_OPTS -XX:+UseParNewGC"
JAVA_OPTS="$JAVA_OPTS -XX:+UseConcMarkSweepGC"
JAVA_OPTS="$JAVA_OPTS -XX:+CMSParallelRemarkEnabled"

0 comments on commit 909f9ca

Please sign in to comment.
Something went wrong with that request. Please try again.