Skip to content

Commit

Permalink
HBASE-16753 There is a mismatch between suggested Java version in hba…
Browse files Browse the repository at this point in the history
…se-env.sh

Signed-off-by: Dima Spivak <dimaspivak@apache.org>
  • Loading branch information
uagashe authored and dimaspivak committed Oct 5, 2016
1 parent 3aa4dfa commit 1f1a13f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bin/hbase-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conf/hbase-env.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions conf/hbase-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion src/main/asciidoc/_chapters/configuration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1f1a13f

Please sign in to comment.