Repository: tez Updated Branches: refs/heads/branch-0.7 e09b9f658 -> b4b4d21e2
FIX CHANGES.txt conflict (cherry picked from commit 1c4cc8a20c81259319c07d34fe496fd94e06dba8) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/b4b4d21e Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/b4b4d21e Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/b4b4d21e Branch: refs/heads/branch-0.7 Commit: b4b4d21e28537ac652b553df473ebcbbfae0c8b7 Parents: e09b9f6 Author: Jeff Zhang <[email protected]> Authored: Thu May 14 08:26:07 2015 +0800 Committer: Jeff Zhang <[email protected]> Committed: Thu May 14 08:27:06 2015 +0800 ---------------------------------------------------------------------- CHANGES.txt | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/b4b4d21e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 86010c4..49844d6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -183,12 +183,8 @@ Release 0.6.1: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: -<<<<<<< HEAD TEZ-2057. tez-dag/pom.xml contains versions for dependencies. TEZ-2282. Delimit reused yarn container logs (stderr, stdout, syslog) with task attempt start/stop events - TEZ-1529. ATS and TezClient integration in secure kerberos enabled cluster. -======= ->>>>>>> parent of f0b9d7e... TEZ-1529. ATS and TezClient integration in secure kerberos enabled cluster. (Prakash Ramachandran via hitesh) TEZ-2396. pig-tez-tfile-parser pom is hard coded to depend on 0.6.0-SNAPSHOT version. TEZ-2237. Valid events should be sent out when an Output is not started. TEZ-1988. Tez UI: does not work when using file:// in a browser
