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:25 UTC
[34/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/7060502e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7060502e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7060502e
Branch: refs/heads/trunk
Commit: 7060502edbd66b433d78956651875a05649f4807
Parents: 2639779 ac70c27
Author: arp <ar...@apache.org>
Authored: Fri Sep 26 11:09:03 2014 -0700
Committer: arp <ar...@apache.org>
Committed: Fri Sep 26 11:09:03 2014 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +
.../dev-support/findbugsExcludeFile.xml | 4 +
hadoop-common-project/hadoop-common/pom.xml | 1 +
.../hadoop-common/src/main/bin/hadoop | 4 +
.../hadoop/fs/CommonConfigurationKeys.java | 3 +
.../apache/hadoop/tracing/SpanReceiverHost.java | 136 ++++++++++---
.../apache/hadoop/tracing/SpanReceiverInfo.java | 64 ++++++
.../hadoop/tracing/SpanReceiverInfoBuilder.java | 42 ++++
.../org/apache/hadoop/tracing/TraceAdmin.java | 197 +++++++++++++++++++
.../hadoop/tracing/TraceAdminProtocol.java | 69 +++++++
.../hadoop/tracing/TraceAdminProtocolPB.java | 38 ++++
...raceAdminProtocolServerSideTranslatorPB.java | 118 +++++++++++
.../tracing/TraceAdminProtocolTranslatorPB.java | 105 ++++++++++
.../src/main/proto/TraceAdmin.proto | 73 +++++++
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 180 +++++++++--------
.../apache/hadoop/hdfs/HDFSPolicyProvider.java | 6 +-
.../hadoop/hdfs/server/datanode/DataNode.java | 34 +++-
.../hadoop/hdfs/server/namenode/NameNode.java | 5 +-
.../hdfs/server/namenode/NameNodeRpcServer.java | 35 +++-
.../hdfs/server/protocol/NamenodeProtocols.java | 4 +-
.../apache/hadoop/tracing/TestTraceAdmin.java | 90 +++++++++
hadoop-mapreduce-project/CHANGES.txt | 3 +
.../apache/hadoop/mapreduce/TypeConverter.java | 5 +-
.../counters/FileSystemCounterGroup.java | 15 +-
.../counters/FrameworkCounterGroup.java | 28 ++-
.../org/apache/hadoop/mapred/TestCounters.java | 54 +++++
hadoop-tools/hadoop-aws/pom.xml | 2 +-
hadoop-yarn-project/CHANGES.txt | 3 +
.../src/site/apt/FairScheduler.apt.vm | 3 +
29 files changed, 1194 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7060502e/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
----------------------------------------------------------------------