diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-10-15 22:51:58 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-10-15 22:55:43 -0700 |
| commit | 35befe07bb79411f453cf05d482ff051fa827b47 (patch) | |
| tree | 6fbda5a79a25a45257b57013ac8a6629a1a095fb /project/SparkBuild.scala | |
| parent | b5346064d6a2b6858e77b718d2fbadd691374282 (diff) | |
| download | spark-35befe07bb79411f453cf05d482ff051fa827b47.tar.gz spark-35befe07bb79411f453cf05d482ff051fa827b47.tar.bz2 spark-35befe07bb79411f453cf05d482ff051fa827b47.zip | |
Fixing spark streaming example and a bug in examples build.
- Examples assembly included a log4j.properties which clobbered Spark's
- Example had an error where some classes weren't serializable
- Did some other clean-up in this example
Diffstat (limited to 'project/SparkBuild.scala')
| -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 973f1e2f11..f2bbe5358f 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -311,6 +311,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 |