aboutsummaryrefslogtreecommitdiff
path: root/core/pom.xml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into master-mergePrashant Sharma2013-07-031-3/+79
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/pom.xml core/src/main/scala/spark/MapOutputTracker.scala core/src/main/scala/spark/RDD.scala core/src/main/scala/spark/RDDCheckpointData.scala core/src/main/scala/spark/SparkContext.scala core/src/main/scala/spark/Utils.scala core/src/main/scala/spark/api/python/PythonRDD.scala core/src/main/scala/spark/deploy/client/Client.scala core/src/main/scala/spark/deploy/master/MasterWebUI.scala core/src/main/scala/spark/deploy/worker/Worker.scala core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala core/src/main/scala/spark/rdd/BlockRDD.scala core/src/main/scala/spark/rdd/ZippedRDD.scala core/src/main/scala/spark/scheduler/cluster/StandaloneSchedulerBackend.scala core/src/main/scala/spark/storage/BlockManager.scala core/src/main/scala/spark/storage/BlockManagerMaster.scala core/src/main/scala/spark/storage/BlockManagerMasterActor.scala core/src/main/scala/spark/storage/BlockManagerUI.scala core/src/main/scala/spark/util/AkkaUtils.scala core/src/test/scala/spark/SizeEstimatorSuite.scala pom.xml project/SparkBuild.scala repl/src/main/scala/spark/repl/SparkILoop.scala repl/src/test/scala/spark/repl/ReplSuite.scala streaming/src/main/scala/spark/streaming/StreamingContext.scala streaming/src/main/scala/spark/streaming/api/java/JavaStreamingContext.scala streaming/src/main/scala/spark/streaming/dstream/KafkaInputDStream.scala streaming/src/main/scala/spark/streaming/util/MasterFailureTest.scala
| * Update ASM to version 4.0Matei Zaharia2013-06-191-2/+2
| |
| * Added dependency on netty-all in Maven.Reynold Xin2013-05-161-0/+4
| |
| * Added derby dependency to Maven pom files for the JDBC Java test.Reynold Xin2013-05-141-0/+5
| |
| * Update Maven build to Scala 2.9.3Jey Kottalam2013-05-061-2/+2
| |
| * Attempt at fixing merge conflictMridul Muralidharan2013-04-241-1/+1
| |\
| * | Patch from Thomas Graves to improve the YARN Client, and move to more ↵Mridul Muralidharan2013-04-241-0/+5
| | | | | | | | | | | | production ready hadoop yarn branch
| * | Add support for building against hadoop2-yarn : adding new maven profile for itMridul Muralidharan2013-04-071-0/+62
| | |
* | | Manually merged scala-2.10 and masterPrashant Sharma2013-04-221-13/+11
|\ \ \ | | |/ | |/|
| * | Bump development version to 0.8.0Jey Kottalam2013-03-281-1/+1
| |/
| * Add a log4j compile dependency to fix build in IntelliJMikhail Bautin2013-03-151-1/+5
| | | | | | | | | | Also rename parent project to spark-parent (otherwise it shows up as "parent" in IntelliJ, which is very confusing).
| * bump version to 0.7.1-SNAPSHOT in the subproject poms to keep the maven ↵Mark Hamstra2013-02-281-1/+1
| | | | | | | | build building.
| * Merge remote-tracking branch 'base/master' into dag-sched-testsCharles Reiss2013-02-021-11/+0
| |\ | | | | | | | | | | | | Conflicts: core/src/main/scala/spark/scheduler/DAGScheduler.scala
| | * Remove activation of profiles by defaultMikhail Bautin2013-01-311-11/+0
| | | | | | | | | | | | | | | See the discussion at https://github.com/mesos/spark/pull/355 for why default profile activation is a problem.
| * | Add easymock to POMsCharles Reiss2013-01-291-0/+5
| |/
* / Updated maven build for scala 2.10.folone2013-01-201-8/+12
|/
* Add missing dependency spray-json to Maven buildMikhail Bautin2013-01-131-0/+4
|
* Rename environment variable for hadoop profiles to hadoopVersionShivaram Venkataraman2013-01-121-2/+2
|
* Activate hadoop2 profile in pom.xml with -Dhadoop=2Shivaram Venkataraman2013-01-101-0/+6
|
* Activate hadoop1 if property hadoop is missing. hadoop2 can be activated nowShivaram Venkataraman2013-01-081-1/+3
| | | | by using -Dhadoop -Phadoop2.
* Activate hadoop1 profile by default for maven buildsShivaram Venkataraman2013-01-071-1/+4
|
* Code review feedback fixThomas Dudziak2012-11-281-1/+12
|
* Updated versions in the pom.xml files to match current masterThomas Dudziak2012-11-271-1/+1
|
* Addressed code review commentsThomas Dudziak2012-11-271-0/+1
|
* Added maven and debian build filesThomas Dudziak2012-11-201-0/+258