hive git commit: HIVE-16335: Beeline user HS2 connection file should use /etc/hive/conf instead of /etc/conf/hive (Vihang Karajgaonkar, reviewed by Aihua Xu)

2017-05-04 Thread aihuaxu 
Repository: hive
Updated Branches:
  refs/heads/branch-2 242180be3 -> 08d559b15


HIVE-16335: Beeline user HS2 connection file should use /etc/hive/conf instead 
of /etc/conf/hive (Vihang Karajgaonkar, reviewed by Aihua Xu)


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

Branch: refs/heads/branch-2
Commit: 08d559b1536064ef0e666e5baab78bb6b1b28159
Parents: 242180b
Author: Aihua Xu 
Authored: Tue Apr 4 19:12:50 2017 -0400
Committer: Aihua Xu 
Committed: Thu May 4 15:22:46 2017 -0400

--
 .../hive/beeline/hs2connection/UserHS2ConnectionFileParser.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/08d559b1/beeline/src/java/org/apache/hive/beeline/hs2connection/UserHS2ConnectionFileParser.java
--
diff --git 
a/beeline/src/java/org/apache/hive/beeline/hs2connection/UserHS2ConnectionFileParser.java
 
b/beeline/src/java/org/apache/hive/beeline/hs2connection/UserHS2ConnectionFileParser.java
index 93a6231..7d7d9ae 100644
--- 
a/beeline/src/java/org/apache/hive/beeline/hs2connection/UserHS2ConnectionFileParser.java
+++ 
b/beeline/src/java/org/apache/hive/beeline/hs2connection/UserHS2ConnectionFileParser.java
@@ -44,7 +44,7 @@ public class UserHS2ConnectionFileParser implements 
HS2ConnectionFileParser {
   + (System.getProperty("os.name").toLowerCase().indexOf("windows") != 
-1 ? "" : ".")
   + "beeline" + File.separator;
   public static final String ETC_HIVE_CONF_LOCATION =
-  File.separator + "etc" + File.separator + "conf" + File.separator + 
"hive";
+  File.separator + "etc" + File.separator + "hive" + File.separator + 
"conf";
 
   private final List locations = new ArrayList<>();
   private static final Logger log = 
LoggerFactory.getLogger(UserHS2ConnectionFileParser.class);

[1/2] hive git commit: HIVE-16335: Beeline user HS2 connection file should use /etc/hive/conf instead of /etc/conf/hive (Vihang Karajgaonkar, reviewed by Aihua Xu)

2017-04-04 Thread aihuaxu 
Repository: hive
Updated Branches:
  refs/heads/master 23ac04d3b -> 4e60ea3f7


HIVE-16335: Beeline user HS2 connection file should use /etc/hive/conf instead 
of /etc/conf/hive (Vihang Karajgaonkar, reviewed by Aihua Xu)


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

Branch: refs/heads/master
Commit: c7a44eb707084c65722a9779d3fc32746b36ed09
Parents: 23ac04d
Author: Aihua Xu 
Authored: Tue Apr 4 19:12:50 2017 -0400
Committer: Aihua Xu 
Committed: Tue Apr 4 19:28:16 2017 -0400

--
 .../hive/beeline/hs2connection/UserHS2ConnectionFileParser.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/c7a44eb7/beeline/src/java/org/apache/hive/beeline/hs2connection/UserHS2ConnectionFileParser.java
--
diff --git 
a/beeline/src/java/org/apache/hive/beeline/hs2connection/UserHS2ConnectionFileParser.java
 
b/beeline/src/java/org/apache/hive/beeline/hs2connection/UserHS2ConnectionFileParser.java
index 93a6231..7d7d9ae 100644
--- 
a/beeline/src/java/org/apache/hive/beeline/hs2connection/UserHS2ConnectionFileParser.java
+++ 
b/beeline/src/java/org/apache/hive/beeline/hs2connection/UserHS2ConnectionFileParser.java
@@ -44,7 +44,7 @@ public class UserHS2ConnectionFileParser implements 
HS2ConnectionFileParser {
   + (System.getProperty("os.name").toLowerCase().indexOf("windows") != 
-1 ? "" : ".")
   + "beeline" + File.separator;
   public static final String ETC_HIVE_CONF_LOCATION =
-  File.separator + "etc" + File.separator + "conf" + File.separator + 
"hive";
+  File.separator + "etc" + File.separator + "hive" + File.separator + 
"conf";
 
   private final List locations = new ArrayList<>();
   private static final Logger log = 
LoggerFactory.getLogger(UserHS2ConnectionFileParser.class);