You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/07/30 22:11:13 UTC
git commit: [SQL] Fix compiling of catalyst docs.
Repository: spark
Updated Branches:
refs/heads/master 0feb349ea -> 2248891a4
[SQL] Fix compiling of catalyst docs.
Author: Michael Armbrust <mi...@databricks.com>
Closes #1653 from marmbrus/fixDocs and squashes the following commits:
0aa1feb [Michael Armbrust] Fix compiling of catalyst docs.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2248891a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2248891a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2248891a
Branch: refs/heads/master
Commit: 2248891a43d93cf2c05580211faf1e4f8dc7932d
Parents: 0feb349
Author: Michael Armbrust <mi...@databricks.com>
Authored: Wed Jul 30 13:11:09 2014 -0700
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Wed Jul 30 13:11:09 2014 -0700
----------------------------------------------------------------------
project/SparkBuild.scala | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/2248891a/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index e2dab0f..672343f 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -194,7 +194,10 @@ object Flume {
object Catalyst {
lazy val settings = Seq(
- addCompilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full))
+ addCompilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full),
+ // Quasiquotes break compiling scala doc...
+ // TODO: Investigate fixing this.
+ sources in (Compile, doc) ~= (_ filter (_.getName contains "codegen")))
}
object SQL {