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. Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/9290e5bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/9290e5bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/9290e5bc Branch: refs/heads/master Commit: 9290e5bcd2c8e4d8bbf1d0ce1ac09bbf62ece4e0 Parents: 39af914 48eac0b Author: Matei Zaharia <[email protected]> Authored: Wed Nov 13 16:48:44 2013 -0800 Committer: Matei Zaharia <[email protected]> Committed: Wed Nov 13 16:48:44 2013 -0800 ---------------------------------------------------------------------- project/SparkBuild.scala | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9290e5bc/project/SparkBuild.scala ----------------------------------------------------------------------
