Repository: hadoop Updated Branches: refs/heads/branch-2 6bc65d769 -> da3625207
YARN-2950. Change message to mandate, not suggest JS requirement on UI. Contributed by Dustin Cote. (cherry picked from commit 0e37bbc8e3f8e96acd96522face2f4bb01584cb4) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/da362520 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/da362520 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/da362520 Branch: refs/heads/branch-2 Commit: da3625207711c65004f562eebe3c928268645200 Parents: 6bc65d7 Author: Harsh J <[email protected]> Authored: Sat Dec 13 07:10:11 2014 +0530 Committer: Harsh J <[email protected]> Committed: Sat Dec 13 07:27:37 2014 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/da362520/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index f904b15..c6324d5 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -35,6 +35,9 @@ Release 2.7.0 - UNRELEASED IMPROVEMENTS + YARN-2950. Change message to mandate, not suggest JS requirement on UI. + (Dustin Cote via harsh) + YARN-2891. Failed Container Executor does not provide a clear error message. (Dustin Cote via harsh) http://git-wip-us.apache.org/repos/asf/hadoop/blob/da362520/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java index 7c311bc..6a64d1c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java @@ -91,7 +91,8 @@ public class JQueryUI extends HtmlBlock { public static void jsnotice(HTML html) { html. div("#jsnotice.ui-state-error"). - _("This page works best with javascript enabled.")._(); + _("This page will not function without javascript enabled." + + " Please enable javascript on your browser.")._(); html. script().$type("text/javascript"). _("$('#jsnotice').hide();")._();
