diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-11-13 16:48:44 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-11-13 16:48:44 -0800 |
| commit | 9290e5bcd2c8e4d8bbf1d0ce1ac09bbf62ece4e0 (patch) | |
| tree | eee0437d006079fb5c25a3eab44f9c56b1c24c2a /project | |
| parent | 39af914b273e35ff431844951ee8dfadcbc0c400 (diff) | |
| parent | 48eac0bcbf8ab80237af5f50abd4f7734a4837eb (diff) | |
| download | spark-9290e5bcd2c8e4d8bbf1d0ce1ac09bbf62ece4e0.tar.gz spark-9290e5bcd2c8e4d8bbf1d0ce1ac09bbf62ece4e0.tar.bz2 spark-9290e5bcd2c8e4d8bbf1d0ce1ac09bbf62ece4e0.zip | |
Merge pull request #165 from NathanHowell/kerberos-master
spark-assembly.jar fails to authenticate with YARN ResourceManager
The META-INF/services/ sbt MergeStrategy was discarding support for Kerberos, among others. This pull request changes to a merge strategy similar to sbt-assembly's default. I've also included an update to sbt-assembly 0.9.2, a minor fix to it's zip file handling.
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 96232718f8..bccf36c00f 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -328,7 +328,7 @@ object SparkBuild extends Build { 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 m if m.toLowerCase.startsWith("meta-inf/services/") => MergeStrategy.filterDistinctLines case "reference.conf" => MergeStrategy.concat case _ => MergeStrategy.first } diff --git a/project/plugins.sbt b/project/plugins.sbt index cfcd85082a..4ba0e4280a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/release resolvers += "Spray Repository" at "http://repo.spray.cc/" -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.9.1") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.9.2") addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0") |