tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject tez git commit: Fix CHANGES.txt
Date Fri, 25 Sep 2015 18:01:24 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.7 7dac26e75 -> 4a7441731


Fix CHANGES.txt


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

Branch: refs/heads/branch-0.7
Commit: 4a7441731e6228329495bde651bb95f2479ac3ad
Parents: 7dac26e
Author: Bikas Saha <bikas@apache.org>
Authored: Fri Sep 25 11:01:09 2015 -0700
Committer: Bikas Saha <bikas@apache.org>
Committed: Fri Sep 25 11:01:09 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/4a744173/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fa2e62d..3d51eed 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -279,14 +279,13 @@ Release 0.6.3: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
-<<<<<<< HEAD
-=======
+  TEZ-2398. Flaky test: TestFaultTolerance
+  TEZ-2808. Race condition between preemption and container assignment
+  TEZ-2203. Intern strings in tez counters
   TEZ-2834. Make Tez preemption resilient to incorrect free resource reported
   by YARN
   TEZ-2097. TEZ-UI Add dag logs backend support
->>>>>>> 62d9853... TEZ-2834. Make Tez preemption resilient to incorrect
free resource reported by YARN (bikas)
   TEZ-2812. Preemption sometimes does not respect heartbeats between preemptions
-  TEZ-2097. TEZ-UI Add dag logs backend support
   TEZ-814.  Improve heuristic for determining a task has failed outputs
   TEZ-2809. Minimal distribution compiled on 2.6 fails to run on 2.7
   TEZ-2768. Log a useful error message when the summary stream cannot be closed when shutting
@@ -508,6 +507,7 @@ INCOMPATIBLE CHANGES
   TEZ-2552. CRC errors can cause job to run for very long time in large jobs.
 
 ALL CHANGES:
+  TEZ-2398. Flaky test: TestFaultTolerance
   TEZ-2834. Make Tez preemption resilient to incorrect free resource reported
   by YARN
   TEZ-2812. Preemption sometimes does not respect heartbeats between preemptions


Mime
View raw message