reverted license, changed test in shuffle to fail

Author: Brennon York

core/src/main/scala/org/apache/spark/SparkContext.scala

@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.spark
 
 import scala.language.implicitConversions

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

@@ -84,7 +84,8 @@ abstract class ShuffleSuite extends FunSuite with Matchers with LocalSparkContex
       NonJavaSerializableClass,
       NonJavaSerializableClass](b, new HashPartitioner(3))
     c.setSerializer(new KryoSerializer(conf))
-    assert(c.count === 10)
+    // assert(c.count === 10)
+    assert(c.count === 42)
   }
 
   test("zero sized blocks") {