Repository: hadoop Updated Branches: refs/heads/branch-2 a0b3e43a6 -> d3f950809
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/d3f95080 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d3f95080 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d3f95080 Branch: refs/heads/branch-2 Commit: d3f95080964eebefd7c3d5a05e7ecef8aa0697af Parents: a0b3e43 Author: Karthik Kambatla <[email protected]> Authored: Wed Nov 18 13:45:00 2015 -0800 Committer: Karthik Kambatla <[email protected]> Committed: Wed Nov 18 13:45:00 2015 -0800 ---------------------------------------------------------------------- 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/d3f95080/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/d3f95080/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 2e99185..2e14c7f 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1007,6 +1007,8 @@ Release 2.8.0 - UNRELEASED YARN-4345. yarn rmadmin -updateNodeResource doesn't work (Junping Du via jlowe) + YARN-4367. SLS webapp doesn't load. (kasha) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES
