You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/09/19 20:07:30 UTC
git commit: HBASE-12021 Hbase shell does not respect the HBASE_OPTS
set by the user in console (Ashish Singhi)
Repository: hbase
Updated Branches:
refs/heads/branch-1 0eba052ad -> 73cd983e7
HBASE-12021 Hbase shell does not respect the HBASE_OPTS set by the user in console (Ashish Singhi)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/73cd983e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/73cd983e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/73cd983e
Branch: refs/heads/branch-1
Commit: 73cd983e73dfd1551c7ba6e37531e85541aa95f2
Parents: 0eba052
Author: stack <st...@apache.org>
Authored: Fri Sep 19 11:06:53 2014 -0700
Committer: stack <st...@apache.org>
Committed: Fri Sep 19 11:07:19 2014 -0700
----------------------------------------------------------------------
bin/hbase | 3 +++
bin/hbase.cmd | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/73cd983e/bin/hbase
----------------------------------------------------------------------
diff --git a/bin/hbase b/bin/hbase
index 965aa6a..41620f0 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -52,6 +52,9 @@
# JRUBY_OPTS Extra options (eg '--1.9') passed to the hbase shell.
# Empty by default.
#
+# HBASE_SHELL_OPTS Extra options passed to the hbase shell.
+# Empty by default.
+#
bin=`dirname "$0"`
bin=`cd "$bin">/dev/null; pwd`
http://git-wip-us.apache.org/repos/asf/hbase/blob/73cd983e/bin/hbase.cmd
----------------------------------------------------------------------
diff --git a/bin/hbase.cmd b/bin/hbase.cmd
index 9c923c4..2e75c38 100644
--- a/bin/hbase.cmd
+++ b/bin/hbase.cmd
@@ -42,6 +42,8 @@
@rem
@rem JRUBY_OPTS Extra options (eg '--1.9') passed to the hbase shell.
@rem Empty by default.
+@rem HBASE_SHELL_OPTS Extra options passed to the hbase shell.
+@rem Empty by default.
setlocal enabledelayedexpansion
@@ -302,6 +304,7 @@ goto :eof
) else (
set HBASE_OPTS=%HBASE_OPTS% -Dhbase.ruby.sources="%HBASE_HOME%\hbase-shell\src\main\ruby"
)
+ set HBASE_OPTS=%HBASE_OPTS% %HBASE_SHELL_OPTS%
set CLASS=org.jruby.Main -X+O %JRUBY_OPTS% "%HBASE_HOME%\bin\hirb.rb"
goto :eof