diff options
| author | Prashant Sharma <scrapcodes@gmail.com> | 2013-09-15 12:47:20 +0530 |
|---|---|---|
| committer | Prashant Sharma <scrapcodes@gmail.com> | 2013-09-15 12:47:20 +0530 |
| commit | a90e0eff5982ba46b3658e91dec89bd08ce450e5 (patch) | |
| tree | 9c1b35339e704f7793af44fcaa03385dc15cd32f /pom.xml | |
| parent | 383e151fd7138cc6a143b3a38037cc3038c2a8b9 (diff) | |
| download | spark-a90e0eff5982ba46b3658e91dec89bd08ce450e5.tar.gz spark-a90e0eff5982ba46b3658e91dec89bd08ce450e5.tar.bz2 spark-a90e0eff5982ba46b3658e91dec89bd08ce450e5.zip | |
version changed 2.9.3 -> 2.10 in shell script.
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -76,17 +76,9 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.5</java.version> -<<<<<<< HEAD <scala.version>2.10</scala.version> <mesos.version>0.9.0-incubating</mesos.version> <akka.version>2.1.4</akka.version> - <spray.version>1.1-M7</spray.version> - <spray.json.version>1.2.3</spray.json.version> -======= - <scala.version>2.9.3</scala.version> - <mesos.version>0.12.1</mesos.version> - <akka.version>2.0.5</akka.version> ->>>>>>> master <slf4j.version>1.7.2</slf4j.version> <log4j.version>1.2.17</log4j.version> <hadoop.version>1.0.4</hadoop.version> |