diff options
| author | Evan Chan <ev@ooyala.com> | 2013-06-28 17:18:35 -0700 |
|---|---|---|
| committer | Evan Chan <ev@ooyala.com> | 2013-06-28 17:18:35 -0700 |
| commit | 1107b4d55b9d5845ebf49fb2eef8cde55095982a (patch) | |
| tree | 81d0d0793862a2b78be199499d35c8fdf13e850d /project | |
| parent | 8113c55df8f4b5f34140ddba5e58e132e3dc2d23 (diff) | |
| parent | 50ca17635a904f9496ccf996cd2f90325168bb9b (diff) | |
| download | spark-1107b4d55b9d5845ebf49fb2eef8cde55095982a.tar.gz spark-1107b4d55b9d5845ebf49fb2eef8cde55095982a.tar.bz2 spark-1107b4d55b9d5845ebf49fb2eef8cde55095982a.zip | |
Merge branch 'master' into 2013-06/assembly-jar-deploy
Conflicts:
run
Previous changes that I made to run and set-dev-classpath.sh instead
have been folded into 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 481c06ef54..6058fb185e 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -236,7 +236,7 @@ object SparkBuild extends Build { def extraAssemblySettings() = Seq(test in assembly := {}) ++ Seq( mergeStrategy in assembly := { case m if m.toLowerCase.endsWith("manifest.mf") => MergeStrategy.discard - case m if m.toLowerCase.matches("meta-inf/.*\\.sf$") => MergeStrategy.discard + case m if m.toLowerCase.matches("meta-inf.*\\.sf$") => MergeStrategy.discard case "reference.conf" => MergeStrategy.concat case _ => MergeStrategy.first } |