diff options
| author | Joseph E. Gonzalez <joseph.e.gonzalez@gmail.com> | 2013-10-18 12:21:19 -0700 |
|---|---|---|
| committer | Joseph E. Gonzalez <joseph.e.gonzalez@gmail.com> | 2013-10-18 12:21:19 -0700 |
| commit | 1856b37e9ddbf539b57f07095eb2143942f3e67c (patch) | |
| tree | 545714394919de5159a71d56e28d4896cf7c5567 /project | |
| parent | 3f3d28c73f3771f6bbfd8096609629a53dc64987 (diff) | |
| parent | fc26e5b8320556b9edb93741391b759813b4079b (diff) | |
| download | spark-1856b37e9ddbf539b57f07095eb2143942f3e67c.tar.gz spark-1856b37e9ddbf539b57f07095eb2143942f3e67c.tar.bz2 spark-1856b37e9ddbf539b57f07095eb2143942f3e67c.zip | |
Merge branch 'master' of https://github.com/apache/incubator-spark into indexedrdd_graphx
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index fee9d1c6b9..079e698ea0 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -317,6 +317,7 @@ object SparkBuild extends Build { 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 "log4j.properties" => MergeStrategy.discard case "META-INF/services/org.apache.hadoop.fs.FileSystem" => MergeStrategy.concat case "reference.conf" => MergeStrategy.concat case _ => MergeStrategy.first |