You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ss...@apache.org on 2016/05/20 03:56:04 UTC
[2/3] phoenix git commit: Make sqlline refer to bin/hbase-site.xml by
default (Junegunn Choi)
Make sqlline refer to bin/hbase-site.xml by default (Junegunn Choi)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9359e137
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9359e137
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9359e137
Branch: refs/heads/4.x-HBase-0.98
Commit: 9359e1374c2823a9ed6fb4a69e3c67f88da9ba2c
Parents: 341d846
Author: Sergey Soldatov <ss...@apache.org>
Authored: Thu May 19 20:51:38 2016 -0700
Committer: Sergey Soldatov <ss...@apache.org>
Committed: Thu May 19 20:53:34 2016 -0700
----------------------------------------------------------------------
bin/sqlline.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/9359e137/bin/sqlline.py
----------------------------------------------------------------------
diff --git a/bin/sqlline.py b/bin/sqlline.py
index f14cfc7..6d537e3 100755
--- a/bin/sqlline.py
+++ b/bin/sqlline.py
@@ -88,7 +88,7 @@ if os.name == 'nt':
colorSetting = "false"
java_cmd = java + ' $PHOENIX_OPTS ' + \
- ' -cp "' + phoenix_utils.hbase_conf_dir + os.pathsep + phoenix_utils.phoenix_client_jar + os.pathsep + phoenix_utils.hadoop_common_jar + os.pathsep + phoenix_utils.hadoop_hdfs_jar + \
+ ' -cp "' + hbase_config_path + os.pathsep + phoenix_utils.hbase_conf_dir + os.pathsep + phoenix_utils.phoenix_client_jar + os.pathsep + phoenix_utils.hadoop_common_jar + os.pathsep + phoenix_utils.hadoop_hdfs_jar + \
os.pathsep + phoenix_utils.hadoop_conf + os.pathsep + phoenix_utils.hadoop_classpath + '" -Dlog4j.configuration=file:' + \
os.path.join(phoenix_utils.current_dir, "log4j.properties") + \
" sqlline.SqlLine -d org.apache.phoenix.jdbc.PhoenixDriver \