Repository: hadoop Updated Branches: refs/heads/branch-2 f56266fcc -> ecfd25dc6
YARN-4657. Javadoc comment is broken for Resources.multiplyByAndAddTo(). (Daniel Templeton via kasha) (cherry picked from commit 81d04cae41182808ace5d86cdac7e4d71871eb1e) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ecfd25dc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ecfd25dc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ecfd25dc Branch: refs/heads/branch-2 Commit: ecfd25dc656d701480d1e3be4a795715e243b120 Parents: f56266f Author: Karthik Kambatla <ka...@cloudera.com> Authored: Fri Apr 1 16:19:54 2016 -0700 Committer: Karthik Kambatla <ka...@cloudera.com> Committed: Fri Apr 1 16:20:18 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/yarn/util/resource/Resources.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ecfd25dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java index b05d021..558f96c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java @@ -152,7 +152,7 @@ public class Resources { } /** - * Multiply @param rhs by @param by, and add the result to @param lhs + * Multiply {@code rhs} by {@code by}, and add the result to {@code lhs} * without creating any new {@link Resource} object */ public static Resource multiplyAndAddTo(