Repository: spark Updated Branches: refs/heads/master 63099122d -> b7d808594
Revert "[SPARK-7042] [BUILD] use the standard akka artifacts with hadoop-2.x" This reverts commit 43aa819c041f6e8301ad1b8f82eb68e14254f636. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b7d80859 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b7d80859 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b7d80859 Branch: refs/heads/master Commit: b7d8085942c564d6c5b81a14d31789e1b215e62b Parents: 6309912 Author: Patrick Wendell <patr...@databricks.com> Authored: Tue May 26 10:05:13 2015 -0700 Committer: Patrick Wendell <patr...@databricks.com> Committed: Tue May 26 10:05:13 2015 -0700 ---------------------------------------------------------------------- pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/b7d80859/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8e936ab..c72d7cb 100644 --- a/pom.xml +++ b/pom.xml @@ -114,8 +114,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <akka.group>com.typesafe.akka</akka.group> - <akka.version>2.3.4</akka.version> + <akka.group>org.spark-project.akka</akka.group> + <akka.version>2.3.4-spark</akka.version> <java.version>1.6</java.version> <sbt.project.name>spark</sbt.project.name> <scala.macros.version>2.0.1</scala.macros.version> @@ -1664,8 +1664,6 @@ <hbase.version>0.98.7-hadoop1</hbase.version> <avro.mapred.classifier>hadoop1</avro.mapred.classifier> <codehaus.jackson.version>1.8.8</codehaus.jackson.version> - <akka.group>org.spark-project.akka</akka.group> - <akka.version>2.3.4-spark</akka.version> </properties> </profile> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
