commit 7a17881aacb863ecbd4f38169cf18a1e4e63c8a6
author Jonathan Eagles <jeagles@yahoo-inc.com> Fri May 19 15:04:29 2017 -0500
committer Jonathan Eagles <jeagles@yahoo-inc.com> Fri May 19 15:04:29 2017 -0500
tree 627a5277a8cfd4d73ac49fc28a27536119595d93
parent a496252e8d527689b7530094780fb28ce25b6b09

TEZ-3334 merge conflict

tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleManager.java

diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleManager.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleManager.java
index 81fac38..10812dc 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleManager.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleManager.java
@@ -485,7 +485,7 @@
     if (inputHost.getNumPendingPartitions() > 0) {
       pendingHosts.add(inputHost); //add it to queue
     }
-    for(InputAttemptIdentifier input : pendingInputsOfOnePartition.getInputs()) {
+    for(InputAttemptIdentifier input : pendingInputsOfOnePartitionRange.getInputs()) {
       ShuffleEventInfo eventInfo = shuffleInfoEventsMap.get(input.getInputIdentifier());
       if (eventInfo != null) {
         eventInfo.scheduledForDownload = true;