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/10 17:42:26 UTC
[21/21] 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/34c014d5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/34c014d5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/34c014d5
Branch: refs/heads/HADOOP-12111
Commit: 34c014d593989f3da5376f762ebbdfd80284d69a
Parents: 5e42d11 0824426
Author: Allen Wittenauer <aw...@apache.org>
Authored: Fri Jul 10 08:41:27 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Fri Jul 10 08:41:27 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 17 +
.../java/org/apache/hadoop/fs/FileContext.java | 3 +
.../java/org/apache/hadoop/fs/FileSystem.java | 20 +-
.../main/java/org/apache/hadoop/fs/Globber.java | 17 +
.../org/apache/hadoop/util/CpuTimeTracker.java | 115 +++
.../java/org/apache/hadoop/util/SysInfo.java | 123 +++
.../org/apache/hadoop/util/SysInfoLinux.java | 535 ++++++++++++
.../org/apache/hadoop/util/SysInfoWindows.java | 196 +++++
...yptoStreamsWithOpensslAesCtrCryptoCodec.java | 3 +
.../apache/hadoop/util/TestSysInfoLinux.java | 361 ++++++++
.../apache/hadoop/util/TestSysInfoWindows.java | 100 +++
.../dev-support/findbugsExcludeFile.xml | 4 +
hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 42 +
.../src/main/proto/ClientDatanodeProtocol.proto | 247 ++++++
.../src/main/proto/ClientNamenodeProtocol.proto | 863 +++++++++++++++++++
.../hadoop-hdfs-client/src/main/proto/acl.proto | 108 +++
.../src/main/proto/datatransfer.proto | 304 +++++++
.../src/main/proto/encryption.proto | 67 ++
.../src/main/proto/hdfs.proto | 611 +++++++++++++
.../src/main/proto/inotify.proto | 126 +++
.../src/main/proto/xattr.proto | 75 ++
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 15 +
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 10 +-
.../hadoop-hdfs/src/contrib/bkjournal/pom.xml | 2 +-
.../ClientNamenodeProtocolTranslatorPB.java | 2 +-
.../server/blockmanagement/BlockManager.java | 2 -
.../hdfs/server/namenode/FSEditLogOp.java | 4 +-
.../src/main/proto/ClientDatanodeProtocol.proto | 247 ------
.../src/main/proto/ClientNamenodeProtocol.proto | 863 -------------------
.../hadoop-hdfs/src/main/proto/acl.proto | 113 ---
.../src/main/proto/datatransfer.proto | 304 -------
.../hadoop-hdfs/src/main/proto/editlog.proto | 35 +
.../hadoop-hdfs/src/main/proto/encryption.proto | 67 --
.../hadoop-hdfs/src/main/proto/hdfs.proto | 611 -------------
.../hadoop-hdfs/src/main/proto/inotify.proto | 126 ---
.../hadoop-hdfs/src/main/proto/xattr.proto | 80 --
.../hdfs/server/namenode/TestFileTruncate.java | 21 +-
.../hdfs/tools/TestDelegationTokenFetcher.java | 39 +
hadoop-mapreduce-project/CHANGES.txt | 3 +
.../hadoop/mapred/TestShuffleHandler.java | 6 +-
hadoop-maven-plugins/pom.xml | 8 +
.../hadoop/maven/plugin/protoc/ProtocMojo.java | 188 +++-
.../gridmix/DummyResourceCalculatorPlugin.java | 19 +
.../hadoop/yarn/sls/nodemanager/NodeInfo.java | 8 +-
.../yarn/sls/scheduler/RMNodeWrapper.java | 5 +
hadoop-yarn-project/CHANGES.txt | 15 +
.../yarn/client/TestResourceTrackerOnHA.java | 2 +-
.../hadoop/yarn/event/AsyncDispatcher.java | 24 +-
.../apache/hadoop/yarn/util/CpuTimeTracker.java | 100 ---
.../util/LinuxResourceCalculatorPlugin.java | 392 +--------
.../yarn/util/ProcfsBasedProcessTree.java | 34 +-
.../yarn/util/ResourceCalculatorPlugin.java | 84 +-
.../yarn/util/WindowsBasedProcessTree.java | 2 +-
.../util/WindowsResourceCalculatorPlugin.java | 158 +---
.../hadoop/yarn/event/DrainDispatcher.java | 13 +-
.../hadoop/yarn/event/TestAsyncDispatcher.java | 61 ++
.../util/TestLinuxResourceCalculatorPlugin.java | 324 -------
.../util/TestResourceCalculatorProcessTree.java | 2 +-
.../TestWindowsResourceCalculatorPlugin.java | 86 --
.../yarn/server/api/records/NodeStatus.java | 43 +-
.../server/api/records/ResourceUtilization.java | 133 +++
.../api/records/impl/pb/NodeStatusPBImpl.java | 34 +-
.../impl/pb/ResourceUtilizationPBImpl.java | 104 +++
.../yarn/server/api/records/package-info.java | 19 +
.../main/proto/yarn_server_common_protos.proto | 7 +
.../nodemanager/NodeStatusUpdaterImpl.java | 19 +-
.../monitor/ContainersMonitor.java | 3 +-
.../monitor/ContainersMonitorImpl.java | 28 +
.../TestPrivilegedOperationExecutor.java | 6 +-
.../reservation/GreedyReservationAgent.java | 27 +-
.../reservation/InMemoryPlan.java | 9 +-
.../InMemoryReservationAllocation.java | 24 +-
.../RLESparseResourceAllocation.java | 43 +-
.../reservation/ReservationAllocation.java | 3 +-
.../reservation/ReservationSystemUtil.java | 51 ++
.../server/resourcemanager/rmnode/RMNode.java | 2 +
.../resourcemanager/rmnode/RMNodeImpl.java | 43 +-
.../resourcemanager/webapp/RMAppsBlock.java | 10 +-
.../yarn/server/resourcemanager/MockNodes.java | 5 +
.../resourcemanager/TestRMNodeTransitions.java | 36 +-
.../reservation/ReservationSystemTestUtil.java | 11 +-
.../reservation/TestCapacityOverTimePolicy.java | 16 +-
.../reservation/TestGreedyReservationAgent.java | 2 +-
.../reservation/TestInMemoryPlan.java | 37 +-
.../TestInMemoryReservationAllocation.java | 29 +-
.../TestRLESparseResourceAllocation.java | 33 +-
.../TestSimpleCapacityReplanner.java | 11 +-
87 files changed, 5074 insertions(+), 3726 deletions(-)
----------------------------------------------------------------------