You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2015/09/14 23:02:47 UTC
[1/2] hive git commit: HIVE-11811: Merge conflict addendum patch
(Prasanth Jayachandran)
Repository: hive
Updated Branches:
refs/heads/llap b0154f4c4 -> dd8b1365d
HIVE-11811: Merge conflict addendum patch (Prasanth Jayachandran)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/0f2be7ee
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/0f2be7ee
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/0f2be7ee
Branch: refs/heads/llap
Commit: 0f2be7eea3f6985659d0666a85671d38e340a3de
Parents: b0154f4
Author: Prasanth Jayachandran <j....@gmail.com>
Authored: Mon Sep 14 16:01:12 2015 -0500
Committer: Prasanth Jayachandran <j....@gmail.com>
Committed: Mon Sep 14 16:01:12 2015 -0500
----------------------------------------------------------------------
ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/0f2be7ee/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
index 12da0f8..6c7c6aa 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
@@ -390,8 +390,6 @@ public abstract class Operator<T extends OperatorDesc> implements Serializable,C
LOG.info("Initialization Done " + id + " " + getName() + " done is reset.");
}
- initializeChildren(hconf);
-
// let's wait on the async ops before continuing
completeInitialization(asyncInitOperations);
}
[2/2] hive git commit: HIVE-11818: LLAP: Rerunning MiniLlap does not
start as web app port is used (Prasanth Jayachandran)
Posted by pr...@apache.org.
HIVE-11818: LLAP: Rerunning MiniLlap does not start as web app port is used (Prasanth Jayachandran)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/dd8b1365
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/dd8b1365
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/dd8b1365
Branch: refs/heads/llap
Commit: dd8b1365dd24079620a40e748477030469c3eaad
Parents: 0f2be7e
Author: Prasanth Jayachandran <j....@gmail.com>
Authored: Mon Sep 14 16:02:29 2015 -0500
Committer: Prasanth Jayachandran <j....@gmail.com>
Committed: Mon Sep 14 16:02:29 2015 -0500
----------------------------------------------------------------------
data/conf/llap/llap-daemon-site.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/dd8b1365/data/conf/llap/llap-daemon-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/llap/llap-daemon-site.xml b/data/conf/llap/llap-daemon-site.xml
index fc9e950..f2851a7 100644
--- a/data/conf/llap/llap-daemon-site.xml
+++ b/data/conf/llap/llap-daemon-site.xml
@@ -24,6 +24,11 @@
</property>
<property>
+ <name>llap.daemon.service.port</name>
+ <value>0</value>
+</property>
+
+<property>
<name>llap.daemon.num.executors</name>
<value>4</value>
</property>