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/31 23:53:49 UTC
[09/10] 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/659deae2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/659deae2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/659deae2
Branch: refs/heads/HADOOP-12111
Commit: 659deae237eca42bd177f5cedb324ab3a22f42db
Parents: e395a3a a890a31
Author: Allen Wittenauer <aw...@apache.org>
Authored: Fri Jul 31 14:44:17 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Fri Jul 31 14:44:17 2015 -0700
----------------------------------------------------------------------
BUILDING.txt | 4 +-
dev-support/docker/Dockerfile | 8 +
hadoop-common-project/hadoop-common/CHANGES.txt | 7 +
hadoop-common-project/hadoop-common/pom.xml | 33 ++
.../hadoop-common/src/main/bin/hadoop | 8 +-
.../hadoop-common/src/main/bin/hadoop-config.sh | 73 +---
.../src/main/bin/hadoop-functions.sh | 369 +++++++++++++++----
.../hadoop-common/src/main/bin/slaves.sh | 3 +-
.../java/org/apache/hadoop/util/RunJar.java | 3 +-
.../scripts/hadoop-functions_test_helper.bash | 56 +++
.../src/test/scripts/hadoop_add_classpath.bats | 100 +++++
.../src/test/scripts/hadoop_add_colonpath.bats | 96 +++++
.../scripts/hadoop_add_common_to_classpath.bats | 71 ++++
.../test/scripts/hadoop_add_javalibpath.bats | 98 +++++
.../src/test/scripts/hadoop_add_ldlibpath.bats | 97 +++++
.../src/test/scripts/hadoop_add_param.bats | 49 +++
.../hadoop_add_to_classpath_userpath.bats | 98 +++++
.../src/test/scripts/hadoop_basic_init.bats | 94 +++++
.../src/test/scripts/hadoop_bootstrap.bats | 51 +++
.../src/test/scripts/hadoop_confdir.bats | 92 +++++
.../test/scripts/hadoop_deprecate_envvar.bats | 32 ++
.../src/test/scripts/hadoop_finalize.bats | 206 +++++++++++
.../scripts/hadoop_finalize_catalina_opts.bats | 56 +++
.../test/scripts/hadoop_finalize_classpath.bats | 64 ++++
.../scripts/hadoop_finalize_hadoop_heap.bats | 87 +++++
.../scripts/hadoop_finalize_hadoop_opts.bats | 52 +++
.../test/scripts/hadoop_finalize_libpaths.bats | 30 ++
.../src/test/scripts/hadoop_java_setup.bats | 47 +++
.../src/test/scripts/hadoop_os_tricks.bats | 34 ++
.../src/test/scripts/hadoop_rotate_log.bats | 52 +++
.../src/test/scripts/hadoop_shellprofile.bats | 91 +++++
.../src/test/scripts/hadoop_slaves.bats | 37 ++
.../src/test/scripts/hadoop_ssh.bats | 51 +++
.../scripts/hadoop_translate_cygwin_path.bats | 48 +++
.../test/scripts/hadoop_validate_classname.bats | 26 ++
.../hadoop-common/src/test/scripts/run-bats.sh | 43 +++
.../hadoop-kms/src/main/sbin/kms.sh | 29 +-
.../hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh | 29 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +
.../hadoop-hdfs/src/main/bin/hdfs | 10 +-
.../hadoop-hdfs/src/main/bin/start-balancer.sh | 12 +-
.../hadoop-hdfs/src/main/bin/stop-balancer.sh | 10 +-
.../hdfs/server/namenode/ha/StandbyState.java | 3 +-
hadoop-mapreduce-project/CHANGES.txt | 5 +
hadoop-mapreduce-project/bin/mapred | 2 +-
.../hadoop/mapreduce/v2/app/MRAppMaster.java | 2 +-
.../v2/app/job/event/JobStartEvent.java | 2 +-
.../mapreduce/v2/app/job/impl/JobImpl.java | 2 +-
.../v2/api/records/TestTaskAttemptReport.java | 131 +++++++
.../v2/api/records/TestTaskReport.java | 139 +++++++
.../mapreduce/v2/app/TestMRAppMaster.java | 88 ++++-
.../v2/api/records/TaskAttemptReport.java | 3 +
.../mapreduce/v2/api/records/TaskReport.java | 5 +-
.../impl/pb/TaskAttemptReportPBImpl.java | 38 +-
.../api/records/impl/pb/TaskReportPBImpl.java | 38 +-
.../mapreduce/jobhistory/EventWriter.java | 19 +-
.../hadoop/mapreduce/v2/hs/CompletedTask.java | 2 +-
.../mapreduce/v2/hs/CompletedTaskAttempt.java | 2 +-
hadoop-yarn-project/CHANGES.txt | 6 +
.../hadoop-yarn/bin/start-yarn.sh | 7 +-
.../hadoop-yarn/bin/stop-yarn.sh | 7 +-
hadoop-yarn-project/hadoop-yarn/bin/yarn | 7 +
.../resourcemanager/NodesListManager.java | 28 +-
.../rmcontainer/RMContainerImpl.java | 27 +-
.../resourcemanager/rmnode/RMNodeImpl.java | 8 +
.../resourcemanager/TestRMNodeTransitions.java | 62 +++-
.../rmapp/TestNodesListManager.java | 162 ++++++++
67 files changed, 2988 insertions(+), 266 deletions(-)
----------------------------------------------------------------------