Repository: tez
Updated Branches:
  refs/heads/branch-0.7 0ce51cc6a -> abedba228


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/abedba22
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/abedba22
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/abedba22

Branch: refs/heads/branch-0.7
Commit: abedba2280ad4e5051ce05dca66a372c8c9efbac
Parents: 0ce51cc
Author: Bikas Saha <[email protected]>
Authored: Fri Sep 18 15:27:00 2015 -0700
Committer: Bikas Saha <[email protected]>
Committed: Fri Sep 18 15:27:00 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/abedba22/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 34e62c9..e7fd73f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -270,11 +270,8 @@ Release 0.6.3: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
-<<<<<<< HEAD
-  TEZ-2097. TEZ-UI Add dag logs backend support
-=======
   TEZ-2812. Preemption sometimes does not respect heartbeats between 
preemptions
->>>>>>> TEZ-2816. Preemption sometimes does not respect heartbeats between 
preemptions (bikas)
+  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

Reply via email to