Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into master-merge | Prashant Sharma | 2013-07-03 | 1 | -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.0 | Matei Zaharia | 2013-06-19 | 1 | -2/+2 |
| | | |||||
| * | Added dependency on netty-all in Maven. | Reynold Xin | 2013-05-16 | 1 | -0/+4 |
| | | |||||
| * | Added derby dependency to Maven pom files for the JDBC Java test. | Reynold Xin | 2013-05-14 | 1 | -0/+5 |
| | | |||||
| * | Update Maven build to Scala 2.9.3 | Jey Kottalam | 2013-05-06 | 1 | -2/+2 |
| | | |||||
| * | Attempt at fixing merge conflict | Mridul Muralidharan | 2013-04-24 | 1 | -1/+1 |
| |\ | |||||
| * | | Patch from Thomas Graves to improve the YARN Client, and move to more ↵ | Mridul Muralidharan | 2013-04-24 | 1 | -0/+5 |
| | | | | | | | | | | | | production ready hadoop yarn branch | ||||
| * | | Add support for building against hadoop2-yarn : adding new maven profile for it | Mridul Muralidharan | 2013-04-07 | 1 | -0/+62 |
| | | | |||||
* | | | Manually merged scala-2.10 and master | Prashant Sharma | 2013-04-22 | 1 | -13/+11 |
|\ \ \ | | |/ | |/| | |||||
| * | | Bump development version to 0.8.0 | Jey Kottalam | 2013-03-28 | 1 | -1/+1 |
| |/ | |||||
| * | Add a log4j compile dependency to fix build in IntelliJ | Mikhail Bautin | 2013-03-15 | 1 | -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 Hamstra | 2013-02-28 | 1 | -1/+1 |
| | | | | | | | | build building. | ||||
| * | Merge remote-tracking branch 'base/master' into dag-sched-tests | Charles Reiss | 2013-02-02 | 1 | -11/+0 |
| |\ | | | | | | | | | | | | | Conflicts: core/src/main/scala/spark/scheduler/DAGScheduler.scala | ||||
| | * | Remove activation of profiles by default | Mikhail Bautin | 2013-01-31 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | See the discussion at https://github.com/mesos/spark/pull/355 for why default profile activation is a problem. | ||||
| * | | Add easymock to POMs | Charles Reiss | 2013-01-29 | 1 | -0/+5 |
| |/ | |||||
* / | Updated maven build for scala 2.10. | folone | 2013-01-20 | 1 | -8/+12 |
|/ | |||||
* | Add missing dependency spray-json to Maven build | Mikhail Bautin | 2013-01-13 | 1 | -0/+4 |
| | |||||
* | Rename environment variable for hadoop profiles to hadoopVersion | Shivaram Venkataraman | 2013-01-12 | 1 | -2/+2 |
| | |||||
* | Activate hadoop2 profile in pom.xml with -Dhadoop=2 | Shivaram Venkataraman | 2013-01-10 | 1 | -0/+6 |
| | |||||
* | Activate hadoop1 if property hadoop is missing. hadoop2 can be activated now | Shivaram Venkataraman | 2013-01-08 | 1 | -1/+3 |
| | | | | by using -Dhadoop -Phadoop2. | ||||
* | Activate hadoop1 profile by default for maven builds | Shivaram Venkataraman | 2013-01-07 | 1 | -1/+4 |
| | |||||
* | Code review feedback fix | Thomas Dudziak | 2012-11-28 | 1 | -1/+12 |
| | |||||
* | Updated versions in the pom.xml files to match current master | Thomas Dudziak | 2012-11-27 | 1 | -1/+1 |
| | |||||
* | Addressed code review comments | Thomas Dudziak | 2012-11-27 | 1 | -0/+1 |
| | |||||
* | Added maven and debian build files | Thomas Dudziak | 2012-11-20 | 1 | -0/+258 |