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/15 07:33:22 UTC

hive git commit: HIVE-11811: Merge conflict addendum patch2 (Prasanth Jayachandran)

Repository: hive
Updated Branches:
  refs/heads/llap dd8b1365d -> 75b1e6d42


HIVE-11811: Merge conflict addendum patch2 (Prasanth Jayachandran)


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

Branch: refs/heads/llap
Commit: 75b1e6d42d63479d797d588ffa7107a38cda57fc
Parents: dd8b136
Author: Prasanth Jayachandran <j....@gmail.com>
Authored: Tue Sep 15 00:33:10 2015 -0500
Committer: Prasanth Jayachandran <j....@gmail.com>
Committed: Tue Sep 15 00:33:10 2015 -0500

----------------------------------------------------------------------
 ql/src/java/org/apache/hadoop/hive/ql/exec/tez/InPlaceUpdates.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/75b1e6d4/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/InPlaceUpdates.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/InPlaceUpdates.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/InPlaceUpdates.java
index 1c06692..61b0d8e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/InPlaceUpdates.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/InPlaceUpdates.java
@@ -15,7 +15,7 @@ import jline.TerminalFactory;
 
 public class InPlaceUpdates {
 
-  public static final int MIN_TERMINAL_WIDTH = 80;
+  public static final int MIN_TERMINAL_WIDTH = 94;
 
   static boolean isUnixTerminal() {