Repository: spark Updated Branches: refs/heads/branch-1.3 5c16ced1e -> 426816b5c
[SQL][docs][minor] Fixed sample code in SQLContext scaladoc Error in the code sample of the `implicits` object in `SQLContext`. Author: Lomig MeÌgard <lomig.meg...@gmail.com> Closes #5051 from tarfaa/simple and squashes the following commits: 5a88acc [Lomig MeÌgard] [docs][minor] Fixed sample code in SQLContext scaladoc (cherry picked from commit 68707225f1a4081aadbf0fd7e6221293a190529b) Signed-off-by: Reynold Xin <r...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/426816b5 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/426816b5 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/426816b5 Branch: refs/heads/branch-1.3 Commit: 426816b5ca42443b99e8af7a6450604dd7794bd6 Parents: 5c16ced Author: Lomig MeÌgard <lomig.meg...@gmail.com> Authored: Mon Mar 16 23:52:42 2015 -0700 Committer: Reynold Xin <r...@databricks.com> Committed: Mon Mar 16 23:52:50 2015 -0700 ---------------------------------------------------------------------- sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/426816b5/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala index 9c49e84..e4c4f32 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala @@ -229,8 +229,8 @@ class SQLContext(@transient val sparkContext: SparkContext) * common Scala objects into [[DataFrame]]s. * * {{{ - * val sqlContext = new SQLContext - * import sqlContext._ + * val sqlContext = new SQLContext(sc) + * import sqlContext.implicits._ * }}} * * @group basic --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
