From cc3903a415c5036fa5ea74d2d1edf4c0fccd1f91 Mon Sep 17 00:00:00 2001
From: Xiangrui Meng <meng@databricks.com>
Date: Fri, 1 May 2015 15:20:19 -0700
Subject: [PATCH 1/6] upgrade Pyrolite to 4.4-0 for testing

---
 core/pom.xml | 4 ++--
 pom.xml      | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 2dfb00d7ecf26..1a1776f976065 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -360,9 +360,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.spark-project</groupId>
+      <groupId>com.github.irmen</groupId>
       <artifactId>pyrolite</artifactId>
-      <version>2.0.1</version>
+      <version>4.4-0</version>
     </dependency>
     <dependency>
       <groupId>net.sf.py4j</groupId>
diff --git a/pom.xml b/pom.xml
index c85c5feeaf383..1ab9046b35430 100644
--- a/pom.xml
+++ b/pom.xml
@@ -266,6 +266,14 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
+    <repository>
+      <id>bintray-mengxr-maven</id>
+      <name>bintray</name>
+      <url>http://dl.bintray.com/mengxr/maven</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>

From 7824a9cb87cd4b2861bafb2ac65f6862b6e09577 Mon Sep 17 00:00:00 2001
From: Xiangrui Meng <meng@databricks.com>
Date: Sun, 3 May 2015 11:03:03 -0700
Subject: [PATCH 2/6] use Pyrolite 3.1

---
 core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index 1a1776f976065..7f2b8afd4fbf9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -362,7 +362,7 @@
     <dependency>
       <groupId>com.github.irmen</groupId>
       <artifactId>pyrolite</artifactId>
-      <version>4.4-0</version>
+      <version>3.1</version>
     </dependency>
     <dependency>
       <groupId>net.sf.py4j</groupId>

From d2d5b5b30a5ec4350cb6b8fbacc05b86b13ad589 Mon Sep 17 00:00:00 2001
From: Xiangrui Meng <meng@databricks.com>
Date: Sun, 3 May 2015 20:42:55 -0700
Subject: [PATCH 3/6] change back to 4.4

---
 core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index 7f2b8afd4fbf9..d40a9e49e5351 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -362,7 +362,7 @@
     <dependency>
       <groupId>com.github.irmen</groupId>
       <artifactId>pyrolite</artifactId>
-      <version>3.1</version>
+      <version>4.4</version>
     </dependency>
     <dependency>
       <groupId>net.sf.py4j</groupId>

From 6ddac0ec05d4eeb78f90c5669c377f14e3f3809a Mon Sep 17 00:00:00 2001
From: Xiangrui Meng <meng@databricks.com>
Date: Sun, 3 May 2015 21:09:18 -0700
Subject: [PATCH 4/6] reverse the machine code for float/double

---
 .../main/scala/org/apache/spark/api/python/SerDeUtil.scala | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/src/main/scala/org/apache/spark/api/python/SerDeUtil.scala b/core/src/main/scala/org/apache/spark/api/python/SerDeUtil.scala
index 257491e90dd66..1f1debcf84ad4 100644
--- a/core/src/main/scala/org/apache/spark/api/python/SerDeUtil.scala
+++ b/core/src/main/scala/org/apache/spark/api/python/SerDeUtil.scala
@@ -56,16 +56,13 @@ private[spark] object SerDeUtil extends Logging {
     //    {'\0', 0, 0, 0} /* Sentinel */
     //  };
     // TODO: support Py_UNICODE with 2 bytes
-    // FIXME: unpickle array of float is wrong in Pyrolite, so we reverse the
-    // machine code for float/double here to workaround it.
-    // we should fix this after Pyrolite fix them
     val machineCodes: Map[Char, Int] = if (ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN)) {
       Map('c' -> 1, 'B' -> 0, 'b' -> 1, 'H' -> 3, 'h' -> 5, 'I' -> 7, 'i' -> 9,
-        'L' -> 11, 'l' -> 13, 'f' -> 14, 'd' -> 16, 'u' -> 21
+        'L' -> 11, 'l' -> 13, 'f' -> 15, 'd' -> 17, 'u' -> 21
       )
     } else {
       Map('c' -> 1, 'B' -> 0, 'b' -> 1, 'H' -> 2, 'h' -> 4, 'I' -> 6, 'i' -> 8,
-        'L' -> 10, 'l' -> 12, 'f' -> 15, 'd' -> 17, 'u' -> 20
+        'L' -> 10, 'l' -> 12, 'f' -> 14, 'd' -> 16, 'u' -> 20
       )
     }
     override def construct(args: Array[Object]): Object = {

From fe7e29b14985732c27490d8405aeb910653002fa Mon Sep 17 00:00:00 2001
From: Xiangrui Meng <meng@databricks.com>
Date: Mon, 4 May 2015 16:54:10 -0700
Subject: [PATCH 5/6] switch to maven central

---
 core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index d40a9e49e5351..c5779447f0c84 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -360,7 +360,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.irmen</groupId>
+      <groupId>org.spark-project</groupId>
       <artifactId>pyrolite</artifactId>
       <version>4.4</version>
     </dependency>

From da3c2dddb730620d9c2afcd30da46bd6e30e876b Mon Sep 17 00:00:00 2001
From: Xiangrui Meng <meng@databricks.com>
Date: Mon, 4 May 2015 16:59:20 -0700
Subject: [PATCH 6/6] remove my repo

---
 pom.xml | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1ab9046b35430..de18741feae3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
     <java.version>1.6</java.version>
     <sbt.project.name>spark</sbt.project.name>
     <scala.macros.version>2.0.1</scala.macros.version>
-    <mesos.version>0.21.0</mesos.version>
+    <mesos.version>0.21.1</mesos.version>
     <mesos.classifier>shaded-protobuf</mesos.classifier>
     <slf4j.version>1.7.10</slf4j.version>
     <log4j.version>1.2.17</log4j.version>
@@ -266,14 +266,6 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
-    <repository>
-      <id>bintray-mengxr-maven</id>
-      <name>bintray</name>
-      <url>http://dl.bintray.com/mengxr/maven</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
@@ -1622,20 +1614,6 @@
     http://hadoop.apache.org/docs/ra.b.c/hadoop-project-dist/hadoop-common/dependency-analysis.html
     -->
 
-    <profile>
-      <id>hadoop-0.23</id>
-      <!-- SPARK-1121: Adds an explicit dependency on Avro to work around a Hadoop 0.23.X issue -->
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.avro</groupId>
-          <artifactId>avro</artifactId>
-        </dependency>
-      </dependencies>
-      <properties>
-        <hadoop.version>0.23.10</hadoop.version>
-      </properties>
-    </profile>
-
     <profile>
       <id>hadoop-2.2</id>
       <properties>