spark git commit: [MINOR] Fix typos in JavaStreamingContext

2015-12-21 Thread rxin 
Repository: spark
Updated Branches:
  refs/heads/branch-1.6 5b19e7cfd -> 309ef355f


[MINOR] Fix typos in JavaStreamingContext

Author: Shixiong Zhu 

Closes #10424 from zsxwing/typo.

(cherry picked from commit 93da8565fea42d8ac978df411daced4a9ea3a9c8)
Signed-off-by: Reynold Xin 


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

Branch: refs/heads/branch-1.6
Commit: 309ef355fc511b70765983358d5c92b5f1a26bce
Parents: 5b19e7c
Author: Shixiong Zhu 
Authored: Mon Dec 21 22:28:18 2015 -0800
Committer: Reynold Xin 
Committed: Mon Dec 21 22:28:26 2015 -0800

--
 .../spark/streaming/api/java/JavaStreamingContext.scala  | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/309ef355/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 8f21c79..7a50135 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
@@ -695,9 +695,9 @@ object JavaStreamingContext {
*
* @param checkpointPath Checkpoint directory used in an earlier 
JavaStreamingContext program
* @param factoryJavaStreamingContextFactory object to create a new 
JavaStreamingContext
-   * @deprecated As of 1.4.0, replaced by `getOrCreate` without 
JavaStreamingContextFactor.
+   * @deprecated As of 1.4.0, replaced by `getOrCreate` without 
JavaStreamingContextFactory.
*/
-  @deprecated("use getOrCreate without JavaStreamingContextFactor", "1.4.0")
+  @deprecated("use getOrCreate without JavaStreamingContextFactory", "1.4.0")
   def getOrCreate(
   checkpointPath: String,
   factory: JavaStreamingContextFactory
@@ -718,7 +718,7 @@ object JavaStreamingContext {
* @param factoryJavaStreamingContextFactory object to create a new 
JavaStreamingContext
* @param hadoopConf Hadoop configuration if necessary for reading from 
any HDFS compatible
*   file system
-   * @deprecated As of 1.4.0, replaced by `getOrCreate` without 
JavaStreamingContextFactor.
+   * @deprecated As of 1.4.0, replaced by `getOrCreate` without 
JavaStreamingContextFactory.
*/
   @deprecated("use getOrCreate without JavaStreamingContextFactory", "1.4.0")
   def getOrCreate(
@@ -744,7 +744,7 @@ object JavaStreamingContext {
*   file system
* @param createOnError  Whether to create a new JavaStreamingContext if 
there is an
*   error in reading checkpoint data.
-   * @deprecated As of 1.4.0, replaced by `getOrCreate` without 
JavaStreamingContextFactor.
+   * @deprecated As of 1.4.0, replaced by `getOrCreate` without 
JavaStreamingContextFactory.
*/
   @deprecated("use getOrCreate without JavaStreamingContextFactory", "1.4.0")
   def getOrCreate(


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

spark git commit: [MINOR] Fix typos in JavaStreamingContext

2015-12-21 Thread rxin 
Repository: spark
Updated Branches:
  refs/heads/master 0a38637d0 -> 93da8565f


[MINOR] Fix typos in JavaStreamingContext

Author: Shixiong Zhu 

Closes #10424 from zsxwing/typo.


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

Branch: refs/heads/master
Commit: 93da8565fea42d8ac978df411daced4a9ea3a9c8
Parents: 0a38637
Author: Shixiong Zhu 
Authored: Mon Dec 21 22:28:18 2015 -0800
Committer: Reynold Xin 
Committed: Mon Dec 21 22:28:18 2015 -0800

--
 .../spark/streaming/api/java/JavaStreamingContext.scala  | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/93da8565/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 8f21c79..7a50135 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
@@ -695,9 +695,9 @@ object JavaStreamingContext {
*
* @param checkpointPath Checkpoint directory used in an earlier 
JavaStreamingContext program
* @param factoryJavaStreamingContextFactory object to create a new 
JavaStreamingContext
-   * @deprecated As of 1.4.0, replaced by `getOrCreate` without 
JavaStreamingContextFactor.
+   * @deprecated As of 1.4.0, replaced by `getOrCreate` without 
JavaStreamingContextFactory.
*/
-  @deprecated("use getOrCreate without JavaStreamingContextFactor", "1.4.0")
+  @deprecated("use getOrCreate without JavaStreamingContextFactory", "1.4.0")
   def getOrCreate(
   checkpointPath: String,
   factory: JavaStreamingContextFactory
@@ -718,7 +718,7 @@ object JavaStreamingContext {
* @param factoryJavaStreamingContextFactory object to create a new 
JavaStreamingContext
* @param hadoopConf Hadoop configuration if necessary for reading from 
any HDFS compatible
*   file system
-   * @deprecated As of 1.4.0, replaced by `getOrCreate` without 
JavaStreamingContextFactor.
+   * @deprecated As of 1.4.0, replaced by `getOrCreate` without 
JavaStreamingContextFactory.
*/
   @deprecated("use getOrCreate without JavaStreamingContextFactory", "1.4.0")
   def getOrCreate(
@@ -744,7 +744,7 @@ object JavaStreamingContext {
*   file system
* @param createOnError  Whether to create a new JavaStreamingContext if 
there is an
*   error in reading checkpoint data.
-   * @deprecated As of 1.4.0, replaced by `getOrCreate` without 
JavaStreamingContextFactor.
+   * @deprecated As of 1.4.0, replaced by `getOrCreate` without 
JavaStreamingContextFactory.
*/
   @deprecated("use getOrCreate without JavaStreamingContextFactory", "1.4.0")
   def getOrCreate(


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