diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-06-07 00:42:23 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-06-07 00:42:23 -0700 |
| commit | c62bb4091bfcec8936b74f703ae8051046ddcfb1 (patch) | |
| tree | 54f1df589aa525190a145cb3c1dd79e0cc3f221b /project | |
| parent | 3297706ab2faf8f646dc635abf554d1d34515f73 (diff) | |
| parent | a413b8e59d9a6a463be184d7fbe22a671503fa71 (diff) | |
| download | spark-c62bb4091bfcec8936b74f703ae8051046ddcfb1.tar.gz spark-c62bb4091bfcec8936b74f703ae8051046ddcfb1.tar.bz2 spark-c62bb4091bfcec8936b74f703ae8051046ddcfb1.zip | |
Merge remote-tracking branch 'origin/master' into scala-2.9
Diffstat (limited to 'project')
| -rw-r--r-- | project/build/SparkProject.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/project/build/SparkProject.scala b/project/build/SparkProject.scala index b93ae17d85..1ffcc3ef34 100644 --- a/project/build/SparkProject.scala +++ b/project/build/SparkProject.scala @@ -49,6 +49,7 @@ class SparkProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje class BagelProject(info: ProjectInfo) extends DefaultProject(info) with BaseProject with DepJar with XmlTestReport + override def managedStyle = ManagedStyle.Maven } @@ -101,5 +102,4 @@ trait DepJar extends AssemblyBuilder { depJarOutputPath, packageOptions) }.dependsOn(compile).describedAs("Bundle project's dependencies into a JAR.") - override def managedStyle = ManagedStyle.Maven } |