diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-07-13 19:10:00 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-07-13 19:10:00 -0700 |
| commit | cd28d9c14732a91416589bb3dc523533495240e8 (patch) | |
| tree | 1ab921af65b56d3c3d5dd3a94670bda8d8f68a36 /project | |
| parent | 1889f9f450d3e28864a5ac7b5f9d3831cf7b17bf (diff) | |
| parent | 1107b4d55b9d5845ebf49fb2eef8cde55095982a (diff) | |
| download | spark-cd28d9c14732a91416589bb3dc523533495240e8.tar.gz spark-cd28d9c14732a91416589bb3dc523533495240e8.tar.bz2 spark-cd28d9c14732a91416589bb3dc523533495240e8.zip | |
Merge remote-tracking branch 'origin/pr/662'
Conflicts:
bin/compute-classpath.sh
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 641d379749..bc9214d17d 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -197,7 +197,7 @@ object SparkBuild extends Build { def replSettings = sharedSettings ++ Seq( name := "spark-repl", libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _) - ) + ) ++ assemblySettings ++ extraAssemblySettings def examplesSettings = sharedSettings ++ Seq( name := "spark-examples", |