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 aw...@apache.org on 2015/07/27 19:54:01 UTC

[4/5] hadoop git commit: Merge branch 'trunk' into HADOOP-12111

Merge branch 'trunk' into HADOOP-12111


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

Branch: refs/heads/HADOOP-12111
Commit: ce41c53791bc3ed775efc9629eba59f9a70c9f95
Parents: 8d6dbbb 2196e39
Author: Allen Wittenauer <aw...@apache.org>
Authored: Mon Jul 27 10:52:18 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Mon Jul 27 10:52:18 2015 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |   5 +
 .../hdfs/TestDFSInotifyEventInputStream.java    |   4 +-
 .../hadoop/hdfs/TestDistributedFileSystem.java  |  13 +-
 hadoop-yarn-project/CHANGES.txt                 |   3 +
 .../hadoop-yarn/hadoop-yarn-api/pom.xml         |  34 +++++
 .../yarn/conf/TestYarnConfigurationFields.java  | 136 +++++++++++++++++++
 .../yarn/conf/TestYarnConfigurationFields.java  | 136 -------------------
 7 files changed, 188 insertions(+), 143 deletions(-)
----------------------------------------------------------------------