tez git commit: TEZ-2828. Fix typo in "Shuffle assigned " log statement in shuffle.orderedgrouped.Shuffle. (Johannes Zillmann via hitesh)

[hitesh]

Repository: tez
Updated Branches:
  refs/heads/branch-0.7 d9090cfda -> 850e9389e


TEZ-2828. Fix typo in "Shuffle assigned " log statement in 
shuffle.orderedgrouped.Shuffle. (Johannes Zillmann via hitesh)

(cherry picked from commit fccb6f1277e57ee5f4df34af664be7354344bf1c)

Conflicts:
        CHANGES.txt


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

Branch: refs/heads/branch-0.7
Commit: 850e9389e59bb80b507cd169647ad4a5397df0b9
Parents: d9090cf
Author: Hitesh Shah <hit...@apache.org>
Authored: Tue Nov 3 16:08:43 2015 -0800
Committer: Hitesh Shah <hit...@apache.org>
Committed: Tue Nov 3 16:10:20 2015 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                      | 1 +
 .../runtime/library/common/shuffle/orderedgrouped/Shuffle.java   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/850e9389/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d4005f7..886a9f2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
   TEZ-2679. Admin forms of launch env settings
 
 ALL CHANGES
+  TEZ-2828. Fix typo in "Shuffle assigned " log statement in 
shuffle.orderedgrouped.Shuffle.
   TEZ-2909. Tez UI: Application link in All DAGs table is disable when 
applicationhistory is unavailable
   TEZ-2553. Tez UI: Tez UI Nits
   TEZ-2900. Ignore V_INPUT_DATA_INFORMATION when vertex is in 
Failed/Killed/Error

http://git-wip-us.apache.org/repos/asf/tez/blob/850e9389/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/Shuffle.java
----------------------------------------------------------------------
diff --git 
a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/Shuffle.java
 
b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/Shuffle.java
index 417e66a..cad820f 100644
--- 
a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/Shuffle.java
+++ 
b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/Shuffle.java
@@ -189,8 +189,8 @@ public class Shuffle implements ExceptionReporter {
         TaskCounter.SHUFFLE_BYTES_TO_MEM);
     
     LOG.info(srcNameTrimmed + ": " + "Shuffle assigned with " + numInputs + " 
inputs" + ", codec: "
-        + (codec == null ? "None" : codec.getClass().getName()) + 
-        "ifileReadAhead: " + ifileReadAhead);
+        + (codec == null ? "None" : codec.getClass().getName())
+        + ", ifileReadAhead: " + ifileReadAhead);
 
     boolean sslShuffle = 
conf.getBoolean(TezRuntimeConfiguration.TEZ_RUNTIME_SHUFFLE_ENABLE_SSL,
       TezRuntimeConfiguration.TEZ_RUNTIME_SHUFFLE_ENABLE_SSL_DEFAULT);