ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cleanup

Browse source
This commit is contained in:
Patrick Wendell 2013-12-16 21:56:21 -08:00
parent 24f8220dc8
commit c1fec89895
2 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/pom.xml
View file

@ -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>

6
pom.xml
View file

@ -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>