Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 45fd77b42 -> 238b2bd83


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/238b2bd8
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/238b2bd8
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/238b2bd8

Branch: refs/heads/4.x-HBase-1.1
Commit: 238b2bd837a99d04ed959d18503eb6607d96ead9
Parents: 45fd77b
Author: Sergey Soldatov <[email protected]>
Authored: Thu May 19 20:51:38 2016 -0700
Committer: Sergey Soldatov <[email protected]>
Committed: Thu May 19 20:56:32 2016 -0700

----------------------------------------------------------------------
 bin/sqlline.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/238b2bd8/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 \

Reply via email to