diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-10-15 23:59:56 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-10-15 23:59:56 -0700 |
| commit | 28e9c2abc0884d096fc3be1e2d1f9ee18ffc3261 (patch) | |
| tree | 8022b4f4c24f7ca206a92c09bdc8f613d7fce038 /project | |
| parent | 4e46fde818a9b94960ab83fa6390952e2d5dd3e6 (diff) | |
| parent | 35befe07bb79411f453cf05d482ff051fa827b47 (diff) | |
| download | spark-28e9c2abc0884d096fc3be1e2d1f9ee18ffc3261.tar.gz spark-28e9c2abc0884d096fc3be1e2d1f9ee18ffc3261.tar.bz2 spark-28e9c2abc0884d096fc3be1e2d1f9ee18ffc3261.zip | |
Merge pull request #63 from pwendell/master
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')
| -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 |