spark git commit: Revert "[SPARK-12672][STREAMING][UI] Use the uiRoot function instead of default root path to gain the streaming batch url."

[zsxwing]

Repository: spark
Updated Branches:
  refs/heads/branch-1.6 8f0ead3e7 -> 39b0a3480


Revert "[SPARK-12672][STREAMING][UI] Use the uiRoot function instead of default 
root path to gain the streaming batch url."

This reverts commit 8f0ead3e79beb2c5f2731ceaa34fe1c133763386. Will merge #10618 
instead.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/39b0a348
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/39b0a348
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/39b0a348

Branch: refs/heads/branch-1.6
Commit: 39b0a348008b6ab532768b90fd578b77711af98c
Parents: 8f0ead3
Author: Shixiong Zhu 
Authored: Wed Jan 6 13:53:25 2016 -0800
Committer: Shixiong Zhu 
Committed: Wed Jan 6 13:53:25 2016 -0800

--
 .../org/apache/spark/streaming/scheduler/JobScheduler.scala | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/39b0a348/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
--
diff --git 
a/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
 
b/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
index 2c57706..1ed6fb0 100644
--- 
a/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
+++ 
b/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
@@ -26,8 +26,7 @@ import org.apache.spark.Logging
 import org.apache.spark.rdd.PairRDDFunctions
 import org.apache.spark.streaming._
 import org.apache.spark.streaming.ui.UIUtils
-import org.apache.spark.ui.{UIUtils => SparkUIUtils}
-import org.apache.spark.util.{EventLoop, ThreadUtils}
+import org.apache.spark.util.{EventLoop, ThreadUtils, Utils}
 
 
 private[scheduler] sealed trait JobSchedulerEvent
@@ -204,7 +203,7 @@ class JobScheduler(val ssc: StreamingContext) extends 
Logging {
   try {
 val formattedTime = UIUtils.formatBatchTime(
   job.time.milliseconds, ssc.graph.batchDuration.milliseconds, 
showMMSS = false)
-val batchUrl = 
s"${SparkUIUtils.uiRoot}/streaming/batch/?id=${job.time.milliseconds}"
+val batchUrl = s"/streaming/batch/?id=${job.time.milliseconds}"
 val batchLinkText = s"[output operation ${job.outputOpId}, batch time 
${formattedTime}]"
 
 ssc.sc.setJobDescription(


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: Revert "[SPARK-12672][STREAMING][UI] Use the uiRoot function instead of default root path to gain the streaming batch url."

[zsxwing]

Repository: spark
Updated Branches:
  refs/heads/master 19e4e9feb -> cbaea9591


Revert "[SPARK-12672][STREAMING][UI] Use the uiRoot function instead of default 
root path to gain the streaming batch url."

This reverts commit 19e4e9febf9bb4fd69f6d7bc13a54844e4e096f1. Will merge #10618 
instead.


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

Branch: refs/heads/master
Commit: cbaea9591f089171f3af654d1f9a52916e9f28b9
Parents: 19e4e9f
Author: Shixiong Zhu 
Authored: Wed Jan 6 13:51:50 2016 -0800
Committer: Shixiong Zhu 
Committed: Wed Jan 6 13:51:50 2016 -0800

--
 .../org/apache/spark/streaming/scheduler/JobScheduler.scala | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/cbaea959/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
--
diff --git 
a/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
 
b/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
index 2c57706..1ed6fb0 100644
--- 
a/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
+++ 
b/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
@@ -26,8 +26,7 @@ import org.apache.spark.Logging
 import org.apache.spark.rdd.PairRDDFunctions
 import org.apache.spark.streaming._
 import org.apache.spark.streaming.ui.UIUtils
-import org.apache.spark.ui.{UIUtils => SparkUIUtils}
-import org.apache.spark.util.{EventLoop, ThreadUtils}
+import org.apache.spark.util.{EventLoop, ThreadUtils, Utils}
 
 
 private[scheduler] sealed trait JobSchedulerEvent
@@ -204,7 +203,7 @@ class JobScheduler(val ssc: StreamingContext) extends 
Logging {
   try {
 val formattedTime = UIUtils.formatBatchTime(
   job.time.milliseconds, ssc.graph.batchDuration.milliseconds, 
showMMSS = false)
-val batchUrl = 
s"${SparkUIUtils.uiRoot}/streaming/batch/?id=${job.time.milliseconds}"
+val batchUrl = s"/streaming/batch/?id=${job.time.milliseconds}"
 val batchLinkText = s"[output operation ${job.outputOpId}, batch time 
${formattedTime}]"
 
 ssc.sc.setJobDescription(


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: Revert "[SPARK-12672][STREAMING][UI] Use the uiRoot function instead of default root path to gain the streaming batch url."

[zsxwing]

Repository: spark
Updated Branches:
  refs/heads/branch-1.5 fb421af08 -> d10b9d572


Revert "[SPARK-12672][STREAMING][UI] Use the uiRoot function instead of default 
root path to gain the streaming batch url."

This reverts commit fb421af08de73e4ae6b04a576721109cae561865. Will merge #10618 
instead.


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

Branch: refs/heads/branch-1.5
Commit: d10b9d572dcca49056e00637d68899155e488d02
Parents: fb421af
Author: Shixiong Zhu 
Authored: Wed Jan 6 13:55:00 2016 -0800
Committer: Shixiong Zhu 
Committed: Wed Jan 6 13:55:00 2016 -0800

--
 .../scala/org/apache/spark/streaming/scheduler/JobScheduler.scala | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/d10b9d57/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
--
diff --git 
a/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
 
b/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
index 4cb3132..b5546db 100644
--- 
a/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
+++ 
b/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala
@@ -26,7 +26,6 @@ import org.apache.spark.Logging
 import org.apache.spark.rdd.PairRDDFunctions
 import org.apache.spark.streaming._
 import org.apache.spark.streaming.ui.UIUtils
-import org.apache.spark.ui.{UIUtils => SparkUIUtils}
 import org.apache.spark.util.{EventLoop, ThreadUtils}
 
 
@@ -198,7 +197,7 @@ class JobScheduler(val ssc: StreamingContext) extends 
Logging {
   try {
 val formattedTime = UIUtils.formatBatchTime(
   job.time.milliseconds, ssc.graph.batchDuration.milliseconds, 
showMMSS = false)
-val batchUrl = 
s"${SparkUIUtils.uiRoot}/streaming/batch/?id=${job.time.milliseconds}"
+val batchUrl = s"/streaming/batch/?id=${job.time.milliseconds}"
 val batchLinkText = s"[output operation ${job.outputOpId}, batch time 
${formattedTime}]"
 
 ssc.sc.setJobDescription(


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org