Merge branch 'pr/11338'

2016-04-06 15:06:30 -06:00 · 2016-04-06 15:06:30 -06:00 · 6e44ddaf0e
parent 272f3eb140 85c1334ec9
commit 6e44ddaf0e
2 changed files with 7 additions and 0 deletions
--- a/distribution/src/main/packaging/env/elasticsearch
+++ b/distribution/src/main/packaging/env/elasticsearch
@ -5,6 +5,9 @@
 # Elasticsearch home directory
 #ES_HOME=/usr/share/elasticsearch

+# Elasticsearch Java path
+#JAVA_HOME=
+
 # Elasticsearch configuration directory
 #CONF_DIR=${path.conf}

--- a/docs/reference/setup/install/sysconfig-file.asciidoc
+++ b/docs/reference/setup/install/sysconfig-file.asciidoc
@ -7,6 +7,10 @@

  The group to run as, defaults to `elasticsearch`.

+`JAVA_HOME`::
+
+  Set a custom Java path to be used.
+
 `ES_HEAP_SIZE`::

  The heap size to start with.