hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [20/21] hadoop git commit: Merge branch 'trunk' into HADOOP-12111
Date Thu, 16 Jul 2015 17:37:05 GMT
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/b67f74b4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b67f74b4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b67f74b4

Branch: refs/heads/HADOOP-12111
Commit: b67f74b41885e10020e14579ee9b9afe8158f742
Parents: 33f2feb 1ba2986
Author: Allen Wittenauer <aw@apache.org>
Authored: Thu Jul 16 10:33:53 2015 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Thu Jul 16 10:33:53 2015 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |  16 ++
 .../apache/hadoop/fs/ByteBufferReadable.java    |   4 +
 .../hadoop/io/compress/bzip2/Bzip2Factory.java  |   2 +-
 .../java/org/apache/hadoop/util/SysInfo.java    |  14 ++
 .../org/apache/hadoop/util/SysInfoLinux.java    | 157 +++++++++++++-
 .../org/apache/hadoop/util/SysInfoWindows.java  |  12 ++
 .../apache/hadoop/util/hash/JenkinsHash.java    |  15 +-
 ...yptoStreamsWithOpensslAesCtrCryptoCodec.java |   5 +-
 .../hadoop/io/TestSequenceFileAppend.java       |   5 +
 .../apache/hadoop/test/GenericTestUtils.java    |   9 +
 .../apache/hadoop/util/TestSysInfoLinux.java    |  77 ++++++-
 .../org/apache/hadoop/hdfs/inotify/Event.java   |  37 +++-
 .../src/main/proto/inotify.proto                |   7 +
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |  19 +-
 .../java/org/apache/hadoop/hdfs/DFSClient.java  |   1 +
 .../apache/hadoop/hdfs/protocolPB/PBHelper.java |  17 ++
 .../hadoop/hdfs/server/balancer/Dispatcher.java |  18 ++
 .../hdfs/server/datanode/BlockReceiver.java     |  34 +--
 .../apache/hadoop/hdfs/server/mover/Mover.java  |  27 ++-
 .../namenode/InotifyFSEditLogOpTranslator.java  |   4 +
 .../hdfs/TestDFSInotifyEventInputStream.java    |  17 +-
 .../hadoop/hdfs/TestDistributedFileSystem.java  |  43 +++-
 .../TestBlockReportRateLimiting.java            |  64 ++----
 .../hadoop/hdfs/server/mover/TestMover.java     |   2 +-
 hadoop-mapreduce-project/CHANGES.txt            |   2 +
 .../jobhistory/JobHistoryEventHandler.java      |   2 +-
 hadoop-project/pom.xml                          |   2 +-
 hadoop-project/src/site/site.xml                |   2 +-
 .../gridmix/DummyResourceCalculatorPlugin.java  |  17 ++
 hadoop-yarn-project/CHANGES.txt                 |  15 +-
 .../hadoop/yarn/event/AsyncDispatcher.java      |  24 +--
 .../yarn/util/ResourceCalculatorPlugin.java     |  18 ++
 .../hadoop/yarn/event/DrainDispatcher.java      |  13 +-
 .../hadoop/yarn/event/TestAsyncDispatcher.java  |  61 ------
 .../scheduler/fair/FSLeafQueue.java             |   9 +-
 .../scheduler/fair/FairScheduler.java           |  40 ++--
 .../scheduler/fair/SchedulingPolicy.java        |  11 +
 .../DominantResourceFairnessPolicy.java         |  18 +-
 .../fair/policies/FairSharePolicy.java          |  11 +-
 .../scheduler/fair/policies/FifoPolicy.java     |  15 +-
 .../scheduler/fair/TestFSLeafQueue.java         |  64 ++++++
 .../scheduler/fair/TestFairScheduler.java       | 207 ++++++++++++++++---
 .../src/site/markdown/NodeManager.md            |  49 ++++-
 .../src/site/markdown/NodeManagerRestart.md     |  53 -----
 .../hadoop-yarn-site/src/site/markdown/YARN.md  |  22 +-
 45 files changed, 949 insertions(+), 312 deletions(-)
----------------------------------------------------------------------



Mime
View raw message