Merge branch 'pr/11338'

This commit is contained in:
Lee Hinman 2016-04-06 15:06:30 -06:00
commit 6e44ddaf0e
2 changed files with 7 additions and 0 deletions

View File

@ -5,6 +5,9 @@
# Elasticsearch home directory # Elasticsearch home directory
#ES_HOME=/usr/share/elasticsearch #ES_HOME=/usr/share/elasticsearch
# Elasticsearch Java path
#JAVA_HOME=
# Elasticsearch configuration directory # Elasticsearch configuration directory
#CONF_DIR=${path.conf} #CONF_DIR=${path.conf}

View File

@ -7,6 +7,10 @@
The group to run as, defaults to `elasticsearch`. The group to run as, defaults to `elasticsearch`.
`JAVA_HOME`::
Set a custom Java path to be used.
`ES_HEAP_SIZE`:: `ES_HEAP_SIZE`::
The heap size to start with. The heap size to start with.