-
Patrick Wendell authored
Conflicts: core/src/test/scala/org/apache/spark/deploy/JsonProtocolSuite.scala pom.xml
Patrick Wendell authoredConflicts: core/src/test/scala/org/apache/spark/deploy/JsonProtocolSuite.scala pom.xml
Conflicts: core/src/test/scala/org/apache/spark/deploy/JsonProtocolSuite.scala pom.xml
Conflicts: core/src/test/scala/org/apache/spark/deploy/JsonProtocolSuite.scala pom.xml