You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2014/10/01 18:06:06 UTC
[15/50] [abbrv] git commit: Merge branch 'trunk' into HDFS-6581
Merge branch 'trunk' into HDFS-6581
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e4d29fda
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e4d29fda
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e4d29fda
Branch: refs/heads/trunk
Commit: e4d29fda72fbaac0ec85f022155689131dd1a62e
Parents: f8bbf80 6fe5c6b
Author: arp <ar...@apache.org>
Authored: Thu Sep 18 22:45:07 2014 -0700
Committer: arp <ar...@apache.org>
Committed: Thu Sep 18 22:45:07 2014 -0700
----------------------------------------------------------------------
.../hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java | 2 +-
hadoop-yarn-project/CHANGES.txt | 3 +++
.../hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java | 1 +
.../yarn/server/resourcemanager/TestWorkPreservingRMRestart.java | 1 +
4 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------