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:31 UTC
[40/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/1e6b4b9b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1e6b4b9b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1e6b4b9b
Branch: refs/heads/trunk
Commit: 1e6b4b9b2ee20decbcc8a623260b6faf76162f3e
Parents: d45e7c7 a45b331
Author: arp <ar...@apache.org>
Authored: Mon Sep 29 14:01:47 2014 -0700
Committer: arp <ar...@apache.org>
Committed: Mon Sep 29 14:01:47 2014 -0700
----------------------------------------------------------------------
BUILDING.txt | 11 +
dev-support/test-patch.sh | 8 +-
hadoop-common-project/hadoop-common/CHANGES.txt | 6 +
.../apache/hadoop/conf/ReconfigurableBase.java | 4 +-
.../hadoop/crypto/key/JavaKeyStoreProvider.java | 58 +-
.../org/apache/hadoop/crypto/key/KeyShell.java | 6 +-
.../hadoop/util/ApplicationClassLoader.java | 47 +-
...he.hadoop.application-classloader.properties | 57 +
.../FailureInjectingJavaKeyStoreProvider.java | 80 ++
.../crypto/key/TestKeyProviderFactory.java | 48 +-
.../java/org/apache/hadoop/util/TestRunJar.java | 2 +-
....apache.hadoop.crypto.key.KeyProviderFactory | 19 +
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 15 +-
.../hdfs/server/namenode/INodesInPath.java | 25 +-
.../src/main/resources/hdfs-default.xml | 49 +
.../src/site/apt/HdfsImageViewer.apt.vm | 59 +-
.../server/namenode/TestSnapshotPathINodes.java | 6 +-
hadoop-mapreduce-project/CHANGES.txt | 5 +
hadoop-mapreduce-project/INSTALL | 70 --
.../hadoop/mapreduce/v2/util/TestMRApps.java | 4 +-
.../lib/input/TestMRCJCFileInputFormat.java | 3 +-
.../apache/hadoop/mapreduce/v2/TestMRJobs.java | 2 +-
hadoop-yarn-project/CHANGES.txt | 3 +
.../dev-support/findbugs-exclude.xml | 12 +
.../scheduler/capacity/CSQueue.java | 7 +-
.../scheduler/capacity/CapacityScheduler.java | 15 +-
.../CapacitySchedulerConfiguration.java | 18 +
.../capacity/CapacitySchedulerContext.java | 6 +-
.../scheduler/capacity/LeafQueue.java | 349 +++++-
.../scheduler/capacity/ParentQueue.java | 99 +-
.../scheduler/common/fica/FiCaSchedulerApp.java | 27 +
.../capacity/TestApplicationLimits.java | 8 +-
.../scheduler/capacity/TestChildQueueOrder.java | 32 +-
.../scheduler/capacity/TestLeafQueue.java | 148 +--
.../scheduler/capacity/TestParentQueue.java | 81 +-
.../scheduler/capacity/TestReservations.java | 1184 ++++++++++++++++++
36 files changed, 2219 insertions(+), 354 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1e6b4b9b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
----------------------------------------------------------------------