Repository: hadoop Updated Branches: refs/heads/branch-2 723100014 -> 679652fcb
Addendum patch for fix javadocs failure which is caused by YARN-3141. (wangda) (cherry picked from commit e45307c9a063248fcfb08281025d87c4abd343b1) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/679652fc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/679652fc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/679652fc Branch: refs/heads/branch-2 Commit: 679652fcbdfaa6ae3c28636aa4424cda17fb2e21 Parents: 7231000 Author: Wangda Tan <wan...@apache.org> Authored: Tue Sep 20 11:21:01 2016 -0700 Committer: Wangda Tan <wan...@apache.org> Committed: Tue Sep 20 11:21:47 2016 -0700 ---------------------------------------------------------------------- .../resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/679652fc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.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/scheduler/common/fica/FiCaSchedulerApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java index e782ce7..cd1aad4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java @@ -327,7 +327,7 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt { * of the resources that will be allocated to and preempted from this * application. * - * @param rc + * @param resourceCalculator * @param clusterResource * @param minimumAllocation * @return an allocation --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
