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 aa...@apache.org on 2016/01/12 07:13:57 UTC

hadoop git commit: YARN-4567. javadoc failing on java 8. Contributed by Steve Loughran. This closes #67.

Repository: hadoop
Updated Branches:
  refs/heads/trunk 9e792da01 -> da1e3e3c5


YARN-4567. javadoc failing on java 8. Contributed by Steve Loughran. This closes #67.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/da1e3e3c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/da1e3e3c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/da1e3e3c

Branch: refs/heads/trunk
Commit: da1e3e3c571e7cc76adff198bf433e3f23e8b683
Parents: 9e792da
Author: Akira Ajisaka <aa...@apache.org>
Authored: Tue Jan 12 15:12:17 2016 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Tue Jan 12 15:12:17 2016 +0900

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                                    | 2 ++
 .../apache/hadoop/yarn/server/resourcemanager/ResourceManager.java | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/da1e3e3c/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 8573d2b..6238405 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -113,6 +113,8 @@ Release 2.9.0 - UNRELEASED
     YARN-4550. Some tests in TestContainerLanch fails on non-english locale
     environment. (Takashi Ohnishi via stevel)
 
+    YARN-4567. javadoc failing on java 8. (Steve Loughran via aajisaka)
+
 Release 2.8.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/da1e3e3c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
index 3b23ad8..33431f8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
@@ -1006,7 +1006,6 @@ public class ResourceManager extends CompositeService implements Recoverable {
   /**
    * Helper method to create and init {@link #activeServices}. This creates an
    * instance of {@link RMActiveServices} and initializes it.
-   * @throws Exception
    */
   protected void createAndInitActiveServices() {
     activeServices = new RMActiveServices(this);