Stlystic changes

Conflicts:

	core/src/test/scala/spark/MesosSchedulerSuite.scala

bagel/src/test/scala/bagel/BagelSuite.scala

@@ -13,11 +13,11 @@ import spark._
 class TestVertex(val active: Boolean, val age: Int) extends Vertex with Serializable
 class TestMessage(val targetId: String) extends Message[String] with Serializable
 
-class BagelSuite extends FunSuite with Assertions with BeforeAndAfter{
+class BagelSuite extends FunSuite with Assertions with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
+  after {
     sc.stop()
   }
   

core/src/main/scala/spark/broadcast/Broadcast.scala

@@ -177,7 +177,7 @@ object Broadcast extends Logging with Serializable {
   }
 
   private def byteArrayToObject[OUT](bytes: Array[Byte]): OUT = {
-    val in = new ObjectInputStream (new ByteArrayInputStream (bytes)){
+    val in = new ObjectInputStream (new ByteArrayInputStream (bytes)) {
       override def resolveClass(desc: ObjectStreamClass) =
         Class.forName(desc.getName, false, Thread.currentThread.getContextClassLoader)
     }    

core/src/test/scala/spark/BroadcastSuite.scala

@@ -7,8 +7,8 @@ class BroadcastSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }

core/src/test/scala/spark/FailureSuite.scala

@@ -27,8 +27,8 @@ class FailureSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
     
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }

core/src/test/scala/spark/FileSuite.scala

@@ -11,12 +11,12 @@ import org.apache.hadoop.io._
 
 import SparkContext._
 
-class FileSuite extends FunSuite with BeforeAndAfter{
+class FileSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }

core/src/test/scala/spark/PartitioningSuite.scala

@@ -11,8 +11,8 @@ class PartitioningSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }

core/src/test/scala/spark/PipedRDDSuite.scala

@@ -8,8 +8,8 @@ class PipedRDDSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }

core/src/test/scala/spark/RDDSuite.scala

@@ -5,12 +5,12 @@ import org.scalatest.FunSuite
 import org.scalatest.BeforeAndAfter
 import SparkContext._
 
-class RDDSuite extends FunSuite with BeforeAndAfter{
+class RDDSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }

core/src/test/scala/spark/ShuffleSuite.scala

@@ -17,8 +17,8 @@ class ShuffleSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }

core/src/test/scala/spark/SortingSuite.scala

@@ -8,8 +8,8 @@ class SortingSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }

core/src/test/scala/spark/ThreadingSuite.scala

@@ -26,8 +26,8 @@ class ThreadingSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }