hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jia...@apache.org
Subject hadoop git commit: Fix CHANGES.txt for YARN-3840
Date Mon, 09 Nov 2015 22:33:27 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 cb4d4d591 -> a0570ebb1


Fix CHANGES.txt for YARN-3840


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

Branch: refs/heads/branch-2.7
Commit: a0570ebb150bb503bf136fcefd591b27e3edba44
Parents: cb4d4d5
Author: Jian He <jianhe@apache.org>
Authored: Mon Nov 9 14:33:07 2015 -0800
Committer: Jian He <jianhe@apache.org>
Committed: Mon Nov 9 14:33:07 2015 -0800

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt | 15 ---------------
 1 file changed, 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a0570ebb/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 81d729c..0f38fc9 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -15,24 +15,9 @@ Release 2.7.3 - UNRELEASED
     YARN-4326. Fix TestDistributedShell timeout as AHS in MiniYarnCluster no longer 
     binds to default port 8188. (Meng Ding via wangda)
 
-<<<<<<< HEAD
-=======
     YARN-3840. Resource Manager web ui issue when sorting application by id (with
     application having id > 9999) (Mohammad Shahid Khan via jianhe)
 
-Release 2.7.3 - UNRELEASED
-
-  INCOMPATIBLE CHANGES
-
-  NEW FEATURES
-
-  IMPROVEMENTS
-
-  OPTIMIZATIONS
-
-  BUG FIXES
-
->>>>>>> a4ff03b... YARN-3840. Resource Manager web ui issue when sorting
application by id (with application having id > 9999) Contributed by Mohammad Shahid Khan
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES


Mime
View raw message