Merge remote-tracking branch 'origin/branch-0.7' into branch-0.7.1
Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/618bd93a Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/618bd93a Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/618bd93a Branch: refs/heads/branch-0.7.1 Commit: 618bd93a1e7bcd0359d23e82c8fe983b1971e27f Parents: 258d681 8daa21b Author: Hitesh Shah <[email protected]> Authored: Tue May 3 14:58:44 2016 -0700 Committer: Hitesh Shah <[email protected]> Committed: Tue May 3 14:58:44 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../tez/dag/app/dag/impl/TaskAttemptImpl.java | 44 +++++++++++--------- .../apache/tez/dag/app/dag/impl/TaskImpl.java | 13 +++++- .../tez/dag/app/dag/impl/TestTaskAttempt.java | 20 +++------ .../app/dag/impl/TestTaskAttemptRecovery.java | 5 ++- .../tez/dag/app/dag/impl/TestTaskImpl.java | 14 ++++--- 6 files changed, 53 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/618bd93a/CHANGES.txt ----------------------------------------------------------------------
