Repository: hbase Updated Branches: refs/heads/master 3aa4dfa73 -> 1f1a13f2e
HBASE-16753 There is a mismatch between suggested Java version in hbase-env.sh Signed-off-by: Dima Spivak <dimaspi...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1f1a13f2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1f1a13f2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1f1a13f2 Branch: refs/heads/master Commit: 1f1a13f2e2a28eb818cd85b6c50e47b52aaa2c2e Parents: 3aa4dfa Author: Umesh Agashe <uaga...@cloudera.com> Authored: Mon Oct 3 14:02:28 2016 -0700 Committer: Dima Spivak <dimaspi...@apache.org> Committed: Wed Oct 5 10:16:41 2016 -0700 ---------------------------------------------------------------------- bin/hbase-config.sh | 2 +- conf/hbase-env.cmd | 2 +- conf/hbase-env.sh | 4 ++-- src/main/asciidoc/_chapters/configuration.adoc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1f1a13f2/bin/hbase-config.sh ---------------------------------------------------------------------- diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh index d7d7e6f..bf4ee92 100644 --- a/bin/hbase-config.sh +++ b/bin/hbase-config.sh @@ -132,7 +132,7 @@ if [ -z "$JAVA_HOME" ]; then | Please download the latest Sun JDK from the Sun Java web site | | > http://www.oracle.com/technetwork/java/javase/downloads | | | -| HBase requires Java 1.7 or later. | +| HBase requires Java 1.8 or later. | +======================================================================+ EOF exit 1 http://git-wip-us.apache.org/repos/asf/hbase/blob/1f1a13f2/conf/hbase-env.cmd ---------------------------------------------------------------------- diff --git a/conf/hbase-env.cmd b/conf/hbase-env.cmd index d16de55..8c8597e 100644 --- a/conf/hbase-env.cmd +++ b/conf/hbase-env.cmd @@ -18,7 +18,7 @@ @rem Set environment variables here. -@rem The java implementation to use. Java 1.7+ required. +@rem The java implementation to use. Java 1.8+ required. @rem set JAVA_HOME=c:\apps\java @rem Extra Java CLASSPATH elements. Optional. http://git-wip-us.apache.org/repos/asf/hbase/blob/1f1a13f2/conf/hbase-env.sh ---------------------------------------------------------------------- diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh index 31e8441..d9879c6 100644 --- a/conf/hbase-env.sh +++ b/conf/hbase-env.sh @@ -24,8 +24,8 @@ # so try to keep things idempotent unless you want to take an even deeper look # into the startup scripts (bin/hbase, etc.) -# The java implementation to use. Java 1.7+ required. -# export JAVA_HOME=/usr/java/jdk1.6.0/ +# The java implementation to use. Java 1.8+ required. +# export JAVA_HOME=/usr/java/jdk1.8.0/ # Extra Java CLASSPATH elements. Optional. # export HBASE_CLASSPATH= http://git-wip-us.apache.org/repos/asf/hbase/blob/1f1a13f2/src/main/asciidoc/_chapters/configuration.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc index 4804332..048b047 100644 --- a/src/main/asciidoc/_chapters/configuration.adoc +++ b/src/main/asciidoc/_chapters/configuration.adoc @@ -729,7 +729,7 @@ The following lines in the _hbase-env.sh_ file show how to set the `JAVA_HOME` e ---- # The java implementation to use. -export JAVA_HOME=/usr/java/jdk1.7.0/ +export JAVA_HOME=/usr/java/jdk1.8.0/ # The maximum amount of heap to use. Default is left to JVM default. export HBASE_HEAPSIZE=4G