You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/01/14 01:24:34 UTC

[1/2] git commit: Updated JavaStreamingContext to make scaladoc compile.

Updated Branches:
  refs/heads/master b93f9d42f -> 01c0d72b3


Updated JavaStreamingContext to make scaladoc compile.

`sbt/sbt doc` used to fail. This fixed it.


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

Branch: refs/heads/master
Commit: 30328c347bb9974f551fea2d3e9b19c6a9cd25a9
Parents: b93f9d4
Author: Reynold Xin <rx...@apache.org>
Authored: Mon Jan 13 15:58:39 2014 -0800
Committer: Reynold Xin <rx...@apache.org>
Committed: Mon Jan 13 15:58:39 2014 -0800

----------------------------------------------------------------------
 .../org/apache/spark/streaming/api/java/JavaStreamingContext.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/30328c34/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala b/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala
index a2f0b88..1089504 100644
--- a/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala
@@ -132,7 +132,7 @@ class JavaStreamingContext(val ssc: StreamingContext) {
    * Re-creates a StreamingContext from a checkpoint file.
    * @param path Path to the directory that was specified as the checkpoint directory
    */
-  def this(path: String) = this(new StreamingContext(path))
+  def this(path: String) = this(new StreamingContext(path, new Configuration))
 
   /**
    * Re-creates a StreamingContext from a checkpoint file.


[2/2] git commit: Merge pull request #410 from rxin/scaladoc1

Posted by rx...@apache.org.
Merge pull request #410 from rxin/scaladoc1

Updated JavaStreamingContext to make scaladoc compile.

`sbt/sbt doc` used to fail. This fixed it.


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

Branch: refs/heads/master
Commit: 01c0d72b322544665c51a9066b870fd723dbd3d2
Parents: b93f9d4 30328c3
Author: Reynold Xin <rx...@apache.org>
Authored: Mon Jan 13 16:24:30 2014 -0800
Committer: Reynold Xin <rx...@apache.org>
Committed: Mon Jan 13 16:24:30 2014 -0800

----------------------------------------------------------------------
 .../org/apache/spark/streaming/api/java/JavaStreamingContext.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------