aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorMichael Armbrust <michael@databricks.com>2014-04-22 20:02:33 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-04-22 20:02:47 -0700
commit0e03e6ad44d1c10d8a9cea0b3041d23733485ba3 (patch)
tree880ffff6a0b13733a1c110628af2aba760d2d629 /project
parent61930bdc60c4dbcc11b77151fb088892ca076350 (diff)
downloadspark-0e03e6ad44d1c10d8a9cea0b3041d23733485ba3.tar.gz
spark-0e03e6ad44d1c10d8a9cea0b3041d23733485ba3.tar.bz2
spark-0e03e6ad44d1c10d8a9cea0b3041d23733485ba3.zip
SPARK-1562 Fix visibility / annotation of Spark SQL APIs
Author: Michael Armbrust <michael@databricks.com> Closes #489 from marmbrus/sqlDocFixes and squashes the following commits: acee4f3 [Michael Armbrust] Fix visibility / annotation of Spark SQL APIs (cherry picked from commit aa77f8a6a604efe0d02bc8412b3f1ba3903b7a57) Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Diffstat (limited to 'project')
-rw-r--r--project/SparkBuild.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 25f8cc79c8..1ef032d401 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -367,7 +367,7 @@ object SparkBuild extends Build {
publish := {},
unidocProjectFilter in (ScalaUnidoc, unidoc) :=
- inAnyProject -- inProjects(repl, examples, tools, yarn, yarnAlpha),
+ inAnyProject -- inProjects(repl, examples, tools, catalyst, yarn, yarnAlpha),
unidocProjectFilter in (JavaUnidoc, unidoc) :=
inAnyProject -- inProjects(repl, examples, bagel, graphx, catalyst, tools, yarn, yarnAlpha),
@@ -457,7 +457,7 @@ object SparkBuild extends Build {
def catalystSettings = sharedSettings ++ Seq(
name := "catalyst",
// The mechanics of rewriting expression ids to compare trees in some test cases makes
- // assumptions about the the expression ids being contiguious. Running tests in parallel breaks
+ // assumptions about the the expression ids being contiguous. Running tests in parallel breaks
// this non-deterministically. TODO: FIX THIS.
parallelExecution in Test := false,
libraryDependencies ++= Seq(