Repository: hadoop Updated Branches: refs/heads/branch-2 1499af38e -> d9156c124
YARN-4300. [JDK8] Fix javadoc errors caused by wrong tags. (aajisaka) (cherry picked from commit 8a68630dd126348b859e0fbe2d14079965016772) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d9156c12 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d9156c12 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d9156c12 Branch: refs/heads/branch-2 Commit: d9156c1245648040e200714ed45041de92189603 Parents: 1499af3 Author: Akira Ajisaka <[email protected]> Authored: Tue Oct 27 10:28:01 2015 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Tue Oct 27 10:28:30 2015 +0900 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 ++ .../nodemanager/nodelabels/ScriptBasedNodeLabelsProvider.java | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d9156c12/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index d897f1e..11c06ea 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -968,6 +968,8 @@ Release 2.8.0 - UNRELEASED YARN-4169. Fix racing condition of TestNodeStatusUpdaterForLabels. (Naganarasimha G R via wangda) + YARN-4300. [JDK8] Fix javadoc errors caused by wrong tags. (aajisaka) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/d9156c12/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/nodelabels/ScriptBasedNodeLabelsProvider.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/nodelabels/ScriptBasedNodeLabelsProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/nodelabels/ScriptBasedNodeLabelsProvider.java index b4f5002..79d1eb9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/nodelabels/ScriptBasedNodeLabelsProvider.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/nodelabels/ScriptBasedNodeLabelsProvider.java @@ -87,8 +87,6 @@ public class ScriptBasedNodeLabelsProvider extends AbstractNodeLabelsProvider { * <li>Node Labels fetch script file exists</li> * </ol> * - * @param conf - * @return true if node labels script can be run. * @throws IOException */ private void verifyConfiguredScript() @@ -112,8 +110,6 @@ public class ScriptBasedNodeLabelsProvider extends AbstractNodeLabelsProvider { /** * Method used to terminate the Node Labels Fetch script. - * - * @throws Exception */ @Override public void cleanUp() {
