hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject [2/2] hadoop git commit: YARN-4367. SLS webapp doesn't load. (kasha)
Date Sun, 21 May 2017 18:42:48 GMT
YARN-4367. SLS webapp doesn't load. (kasha)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/94031b19
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/94031b19
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/94031b19

Branch: refs/heads/branch-2.7
Commit: 94031b197866af67f68dec6e7f0a5a224258967e
Parents: 6feef1b
Author: Karthik Kambatla <kasha@apache.org>
Authored: Wed Nov 18 13:45:00 2015 -0800
Committer: Konstantin V Shvachko <shv@apache.org>
Committed: Sun May 21 11:42:38 2017 -0700

----------------------------------------------------------------------
 hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh | 3 ++-
 hadoop-yarn-project/CHANGES.txt                | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/94031b19/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh b/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
index 1e402df..b580716 100644
--- a/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
+++ b/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
@@ -77,7 +77,8 @@ calculateClasspath() {
   DEFAULT_LIBEXEC_DIR=${HADOOP_BASE}/../libexec
   HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
   . $HADOOP_LIBEXEC_DIR/hadoop-config.sh
-  export HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${TOOL_PATH}:html"
+  SLS_HTML="${HADOOP_PREFIX}/share/hadoop/tools/sls/html"
+  export HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${TOOL_PATH}:${SLS_HTML}"
 }
 ###############################################################################
 runSimulation() {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/94031b19/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 352d1e7..e14b618 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -88,6 +88,8 @@ Release 2.7.4 - UNRELEASED
     YARN-4302. SLS not able start due to NPE in SchedulerApplicationAttempt
     (Bibin A Chundatt via vvasudev)
 
+    YARN-4367. SLS webapp doesn't load. (kasha)
+
 Release 2.7.3 - 2016-08-25
 
   INCOMPATIBLE CHANGES


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message