Repository: hadoop
Updated Branches:
refs/heads/branch-2 c570ddaa6 -> c143708ac
YARN-7257. AggregatedLogsBlock reports a bad 'end' value as a bad
'start' value. Contributed by Jason Lowe
(cherry picked from commit 28c4957fccebe2d7e63ec9fe9af58313b4f21d4f)
(cherry picked from commit 81e78727938a1c0369f164849cc3a08add31be46)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c143708a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c143708a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c143708a
Branch: refs/heads/branch-2
Commit: c143708acfb17e91c5e4fc9bd9b496fc7d2db29c
Parents: c570dda
Author: Xuan <xgong@apache.org>
Authored: Wed Sep 27 15:46:18 2017 -0700
Committer: Xuan <xgong@apache.org>
Committed: Wed Sep 27 16:04:06 2017 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/yarn/webapp/log/AggregatedLogsBlock.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c143708a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/log/AggregatedLogsBlock.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/log/AggregatedLogsBlock.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/log/AggregatedLogsBlock.java
index 1c0b990..d1abce4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/log/AggregatedLogsBlock.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/log/AggregatedLogsBlock.java
@@ -68,7 +68,7 @@ public class AggregatedLogsBlock extends HtmlBlock {
LogAggregationWebUtils.getLogEndIndex(
html, $("end"));
} catch (NumberFormatException ne) {
- html.h1()._("Invalid log start value: " + $("end"))._();
+ html.h1()._("Invalid log end value: " + $("end"))._();
isValid = false;
}
@@ -133,4 +133,4 @@ public class AggregatedLogsBlock extends HtmlBlock {
sb.append(scheme).append(nodeId).append("/node/application/").append(appId);
return sb.toString();
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
|