You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2013/12/17 07:42:33 UTC
[4/7] git commit: Cleanup
Cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/c1fec898
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/c1fec898
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/c1fec898
Branch: refs/heads/master
Commit: c1fec89895f03dbdbb6f445ea3cdcd2d050555c4
Parents: 24f8220
Author: Patrick Wendell <pw...@gmail.com>
Authored: Mon Dec 16 21:56:21 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Mon Dec 16 21:56:21 2013 -0800
----------------------------------------------------------------------
core/pom.xml | 1 -
pom.xml | 6 ------
2 files changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c1fec898/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b83a2a8..043f6cf 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -97,7 +97,6 @@
<dependency>
<groupId>${akka.group}</groupId>
<artifactId>akka-slf4j_${scala.binary.version}</artifactId>
- <groupId>org.spark-project.akka</groupId>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c1fec898/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 30ef928..21d9da8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,7 +220,6 @@
<version>0.3.1</version>
</dependency>
<dependency>
-<<<<<<< HEAD
<groupId>${akka.group}</groupId>
<artifactId>akka-actor_${scala.binary.version}</artifactId>
<version>${akka.version}</version>
@@ -254,13 +253,8 @@
</exclusions>
</dependency>
<dependency>
-<<<<<<< HEAD
<groupId>${akka.group}</groupId>
<artifactId>akka-zeromq_${scala.binary.version}</artifactId>
-=======
- <groupId>org.spark-project.akka</groupId>
- <artifactId>akka-zeromq_2.10</artifactId>
->>>>>>> Attempt with extra repositories
<version>${akka.version}</version>
<exclusions>
<exclusion>