spark git commit: [SPARK-7926] [PYSPARK] use the official Pyrolite release

2015-05-28 Thread meng
Repository: spark
Updated Branches:
  refs/heads/master b069ad23d - c45d58c14


[SPARK-7926] [PYSPARK] use the official Pyrolite release

Switch to the official Pyrolite release from the one published under 
`org.spark-project`. Thanks irmen for making the releases on Maven Central. We 
didn't upgrade to 4.6 because we don't have enough time for QA. I excludes 
`serpent` from its dependencies because we don't use it in Spark.
~~~
[info]   +-net.jpountz.lz4:lz4:1.3.0
[info]   +-net.razorvine:pyrolite:4.4
[info]   +-net.sf.py4j:py4j:0.8.2.1
~~~

davies

Author: Xiangrui Meng m...@databricks.com

Closes #6472 from mengxr/SPARK-7926 and squashes the following commits:

7b3c6bf [Xiangrui Meng] use the official Pyrolite release


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c45d58c1
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c45d58c1
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c45d58c1

Branch: refs/heads/master
Commit: c45d58c143d68cb807186acc9d060daa8549dd5c
Parents: b069ad2
Author: Xiangrui Meng m...@databricks.com
Authored: Thu May 28 21:20:54 2015 -0700
Committer: Xiangrui Meng m...@databricks.com
Committed: Thu May 28 21:20:54 2015 -0700

--
 core/pom.xml | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/c45d58c1/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index bfa49d0..e58efe4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -377,9 +377,15 @@
   scopetest/scope
 /dependency
 dependency
-  groupIdorg.spark-project/groupId
+  groupIdnet.razorvine/groupId
   artifactIdpyrolite/artifactId
   version4.4/version
+  exclusions
+exclusion
+  groupIdnet.razorvine/groupId
+  artifactIdserpent/artifactId
+/exclusion
+  /exclusions
 /dependency
 dependency
   groupIdnet.sf.py4j/groupId


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org



spark git commit: [SPARK-7926] [PYSPARK] use the official Pyrolite release

2015-05-28 Thread meng
Repository: spark
Updated Branches:
  refs/heads/branch-1.4 b3a590061 - 6e99dd5d0


[SPARK-7926] [PYSPARK] use the official Pyrolite release

Switch to the official Pyrolite release from the one published under 
`org.spark-project`. Thanks irmen for making the releases on Maven Central. We 
didn't upgrade to 4.6 because we don't have enough time for QA. I excludes 
`serpent` from its dependencies because we don't use it in Spark.
~~~
[info]   +-net.jpountz.lz4:lz4:1.3.0
[info]   +-net.razorvine:pyrolite:4.4
[info]   +-net.sf.py4j:py4j:0.8.2.1
~~~

davies

Author: Xiangrui Meng m...@databricks.com

Closes #6472 from mengxr/SPARK-7926 and squashes the following commits:

7b3c6bf [Xiangrui Meng] use the official Pyrolite release

(cherry picked from commit c45d58c143d68cb807186acc9d060daa8549dd5c)
Signed-off-by: Xiangrui Meng m...@databricks.com


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6e99dd5d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6e99dd5d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6e99dd5d

Branch: refs/heads/branch-1.4
Commit: 6e99dd5d042e8a3e49937769a846bef8a66214f8
Parents: b3a5900
Author: Xiangrui Meng m...@databricks.com
Authored: Thu May 28 21:20:54 2015 -0700
Committer: Xiangrui Meng m...@databricks.com
Committed: Thu May 28 21:21:01 2015 -0700

--
 core/pom.xml | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/6e99dd5d/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index bfa49d0..e58efe4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -377,9 +377,15 @@
   scopetest/scope
 /dependency
 dependency
-  groupIdorg.spark-project/groupId
+  groupIdnet.razorvine/groupId
   artifactIdpyrolite/artifactId
   version4.4/version
+  exclusions
+exclusion
+  groupIdnet.razorvine/groupId
+  artifactIdserpent/artifactId
+/exclusion
+  /exclusions
 /dependency
 dependency
   groupIdnet.sf.py4j/groupId


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org