CCing Matei and Prashant. I believe there are outstanding issues which are inhibiting the merge from the scala-2.10 merge into master. We've had such a merge PR ( https://github.com/apache/incubator-spark/pull/211) outstanding for a while now, it just hasn't been clear which way we should merge the changes.
Given the issues in the PR, I'm not sure they'll be resolved quickly, as they may be bugs in Akka itself. As such, my vote is still to update the 2.10 branch so development can continue on there. We need Matei's or Prashant's opinions on this matter, though.
