You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/03/03 17:37:55 UTC

[4/4] hbase git commit: HBASE-13139 Clean up missing JAVA_HOME message in bin/hbase-config.sh

HBASE-13139 Clean up missing JAVA_HOME message in bin/hbase-config.sh

Signed-off-by: Andrew Purtell <ap...@apache.org>
Amending-Author: Andrew Purtell <ap...@apache.org>

Conflicts:
	bin/hbase-config.sh


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c81e22e4
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c81e22e4
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c81e22e4

Branch: refs/heads/0.98
Commit: c81e22e481922ce845748acc58a053423402f809
Parents: 5e993ee
Author: Esteban Gutierrez <es...@cloudera.com>
Authored: Mon Mar 2 11:30:35 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Mar 3 08:37:08 2015 -0800

----------------------------------------------------------------------
 bin/hbase-config.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/c81e22e4/bin/hbase-config.sh
----------------------------------------------------------------------
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 36982f8..0a388ab 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -126,14 +126,12 @@ export MALLOC_ARENA_MAX=${MALLOC_ARENA_MAX:-4}
 if [ -z "$JAVA_HOME" ]; then
     cat 1>&2 <<EOF
 +======================================================================+
-|      Error: JAVA_HOME is not set and Java could not be found         |
+|                    Error: JAVA_HOME is not set                       |
 +----------------------------------------------------------------------+
 | Please download the latest Sun JDK from the Sun Java web site        |
-|       > http://java.sun.com/javase/downloads/ <                      |
+|     > http://www.oracle.com/technetwork/java/javase/downloads        |
 |                                                                      |
 | HBase requires Java 1.6 or later.                                    |
-| NOTE: This script will find Sun Java whether you install using the   |
-|       binary or the RPM based installer.                             |
 +======================================================================+
 EOF
     exit 1