Merge remote-tracking branch 'apache-commit/trunk' into HDFS-7240
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ef128ee4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ef128ee4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ef128ee4 Branch: refs/heads/HDFS-7240 Commit: ef128ee4bc957bd0c7544865b8962c0b1288bccc Parents: 43bed72 06e5dd2 Author: Arpit Agarwal <a...@apache.org> Authored: Wed Jul 22 16:22:48 2015 -0700 Committer: Arpit Agarwal <a...@apache.org> Committed: Wed Jul 22 16:22:48 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 6 ++ .../org/apache/hadoop/io/nativeio/NativeIO.java | 4 -- .../hadoop/fs/azure/NativeAzureFileSystem.java | 8 ++- hadoop-yarn-project/CHANGES.txt | 8 +++ .../src/main/resources/yarn-default.xml | 10 +++ .../util/TestNodeManagerHardwareUtils.java | 5 ++ .../scheduler/SchedulerApplicationAttempt.java | 2 +- .../scheduler/capacity/LeafQueue.java | 8 ++- .../TestCapacitySchedulerNodeLabelUpdate.java | 64 ++++++++++++++++++++ 9 files changed, 106 insertions(+), 9 deletions(-) ----------------------------------------------------------------------