diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-12-11 10:21:53 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-12-11 10:21:53 +0530 |
| commit | 603af51bb5257744ce0db28e7f10db6a2ba899ec (patch) | |
| tree | 31ad611d8d56147ec90108d2b3a92d38eae4d150 /streaming/pom.xml | |
| parent | 17db6a9041d5e83d7b6fe47f9c36758d0613fcd6 (diff) | |
| parent | d2efe13574090e93c600adeacc7f6356bc196e6c (diff) | |
| download | spark-603af51bb5257744ce0db28e7f10db6a2ba899ec.tar.gz spark-603af51bb5257744ce0db28e7f10db6a2ba899ec.tar.bz2 spark-603af51bb5257744ce0db28e7f10db6a2ba899ec.zip | |
Merge branch 'master' into akka-bug-fix
Conflicts:
core/pom.xml
core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala
pom.xml
project/SparkBuild.scala
streaming/pom.xml
yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala
Diffstat (limited to 'streaming/pom.xml')
| -rw-r--r-- | streaming/pom.xml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/streaming/pom.xml b/streaming/pom.xml index 298bc83161..e27b437aae 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -110,15 +110,8 @@ <artifactId>scala-library</artifactId> </dependency> <dependency> - <groupId>com.typesafe.akka</groupId> + <groupId>${akka.group}</groupId> <artifactId>akka-zeromq_2.10</artifactId> - <version>${akka.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.scalatest</groupId> |