diff options
author | Prashant Sharma <prashant.s@imaginea.com> | 2013-10-08 11:29:40 +0530 |
---|---|---|
committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-10-08 11:29:40 +0530 |
commit | 7be75682b931dd52014f3cfdc6887e54583ad0af (patch) | |
tree | b0dd6a28def2562a6f63162034b75f6a8e292278 /pom.xml | |
parent | 3e41495288c897ee3d3b31d5f4836b1cf6ba54d9 (diff) | |
parent | ea34c521025d3408d44d45ab5c132fd9791794f6 (diff) | |
download | spark-7be75682b931dd52014f3cfdc6887e54583ad0af.tar.gz spark-7be75682b931dd52014f3cfdc6887e54583ad0af.tar.bz2 spark-7be75682b931dd52014f3cfdc6887e54583ad0af.zip |
Merge branch 'master' into wip-merge-master
Conflicts:
bagel/pom.xml
core/pom.xml
core/src/test/scala/org/apache/spark/ui/UISuite.scala
examples/pom.xml
mllib/pom.xml
pom.xml
project/SparkBuild.scala
repl/pom.xml
streaming/pom.xml
tools/pom.xml
In scala 2.10, a shorter representation is used for naming artifacts
so changed to shorter scala version for artifacts and made it a property in pom.
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -40,6 +40,7 @@ <connection>scm:git:git@github.com:apache/incubator-spark.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git</developerConnection> <url>scm:git:git@github.com:apache/incubator-spark.git</url> + <tag>HEAD</tag> </scm> <developers> <developer> @@ -598,7 +599,7 @@ <junitxml>.</junitxml> <filereports>${project.build.directory}/SparkTestSuite.txt</filereports> <argLine>-Xms64m -Xmx3g</argLine> - <stderr/> + <stderr /> </configuration> <executions> <execution> |