Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'scripts-reorg' of github.com:shane-huang/incubator-spark into ↵ | Prashant Sharma | 2014-01-02 | 1 | -1/+0 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spark-915-segregate-scripts Conflicts: bin/spark-shell core/pom.xml core/src/main/scala/org/apache/spark/SparkContext.scala core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala core/src/main/scala/org/apache/spark/ui/UIWorkloadGenerator.scala core/src/test/scala/org/apache/spark/DriverSuite.scala python/run-tests sbin/compute-classpath.sh sbin/spark-class sbin/stop-slaves.sh | ||||
| * | deprecate "spark" script and SPAKR_CLASSPATH environment variable | Andrew xia | 2013-10-12 | 1 | -1/+0 |
| | | |||||
* | | Use scala.binary.version in POMs | Mark Hamstra | 2013-12-15 | 1 | -7/+7 |
| | | |||||
* | | Style fixes and addressed review comments at #221 | Prashant Sharma | 2013-12-10 | 1 | -7/+7 |
| | | |||||
* | | Incorporated Patrick's feedback comment on #211 and made maven ↵ | Prashant Sharma | 2013-12-07 | 1 | -1/+1 |
| | | | | | | | | build/dep-resolution atleast a bit faster. | ||||
* | | Merge branch 'master' into wip-merge-master | Prashant Sharma | 2013-10-08 | 1 | -8/+8 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Merging build changes in from 0.8 | Patrick Wendell | 2013-10-05 | 1 | -10/+10 |
| |/ | |||||
* | | Merge branch 'master' into scala-2.10 | Prashant Sharma | 2013-10-01 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/ui/jobs/JobProgressUI.scala docs/_config.yml project/SparkBuild.scala repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala | ||||
| * | Bug fix in master build | Patrick Wendell | 2013-09-26 | 1 | -1/+1 |
| | | |||||
* | | fixed maven build for scala 2.10 | Prashant Sharma | 2013-09-26 | 1 | -6/+6 |
| | | |||||
* | | Merge branch 'master' of git://github.com/mesos/spark into scala-2.10 | Prashant Sharma | 2013-09-15 | 1 | -12/+0 |
|\| | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/SparkContext.scala project/SparkBuild.scala | ||||
| * | Minor YARN build cleanups | Jey Kottalam | 2013-09-06 | 1 | -12/+0 |
| | | |||||
* | | Merged with master | Prashant Sharma | 2013-09-06 | 1 | -171/+69 |
|\| | |||||
| * | Fix some URLs | Matei Zaharia | 2013-09-01 | 1 | -1/+1 |
| | | |||||
| * | Initial work to rename package to org.apache.spark | Matei Zaharia | 2013-09-01 | 1 | -6/+6 |
| | | |||||
| * | Synced sbt and maven builds | Mark Hamstra | 2013-08-21 | 1 | -0/+6 |
| | | |||||
| * | Remove redundant dependencies from POMs | Jey Kottalam | 2013-08-18 | 1 | -15/+0 |
| | | |||||
| * | Updates to repl and example POMs to match SBT build | Jey Kottalam | 2013-08-16 | 1 | -6/+0 |
| | | |||||
| * | Maven build now also works with YARN | Jey Kottalam | 2013-08-16 | 1 | -63/+1 |
| | | |||||
| * | Maven build now works with CDH hadoop-2.0.0-mr1 | Jey Kottalam | 2013-08-16 | 1 | -54/+10 |
| | | |||||
| * | Initial changes to make Maven build agnostic of hadoop version | Jey Kottalam | 2013-08-16 | 1 | -50/+22 |
| | | |||||
| * | Set SPARK_CLASSPATH for maven repl tests | Shivaram Venkataraman | 2013-08-13 | 1 | -0/+30 |
| | | |||||
| * | Add Apache license headers and LICENSE and NOTICE files | Matei Zaharia | 2013-07-16 | 1 | -0/+17 |
| | | |||||
* | | Merge branch 'master' into master-merge | Prashant Sharma | 2013-07-03 | 1 | -11/+68 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Remove spark-repl's extraneous dependency on spark-streaming | Jey Kottalam | 2013-05-01 | 1 | -14/+0 |
| | | |||||
| * | Attempt at fixing merge conflict | Mridul Muralidharan | 2013-04-24 | 1 | -1/+1 |
| |\ | |||||
| * | | Add support for building against hadoop2-yarn : adding new maven profile for it | Mridul Muralidharan | 2013-04-07 | 1 | -0/+71 |
| | | | |||||
* | | | Fixed maven build without netty fix | Prashant Sharma | 2013-06-14 | 1 | -0/+2 |
| |/ |/| | |||||
* | | 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/+1 |
| | | | | | 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. | ||||
* | 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 an Avro dependency to REPL to make it compile with Hadoop 2 | Mikhail Bautin | 2013-01-22 | 1 | -0/+10 |
| | |||||
* | Add Maven build file for streaming, and fix some issues in SBT file | Matei Zaharia | 2013-01-20 | 1 | -0/+14 |
| | | | | | | As part of this, changed our Scala 2.9.2 Kafka library to be available as a local Maven repository, following the example in (http://blog.dub.podval.org/2010/01/maven-in-project-repository.html) | ||||
* | 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 | -0/+3 |
| | |||||
* | Fixed repl maven build to produce artifacts with the appropriate hadoop ↵ | Thomas Dudziak | 2012-12-18 | 1 | -139/+7 |
| | | | | classifier and extracted repl fat-jar and debian packaging into a separate project to make Maven happy | ||||
* | Shaded repl jar for hadoop1 profile needs to include hadoop classes | Thomas Dudziak | 2012-12-10 | 1 | -0/+3 |
| | |||||
* | Merge pull request #318 from tomdz/master | Matei Zaharia | 2012-12-10 | 1 | -1/+3 |
|\ | | | | | Minor tweaks to the debian build | ||||
| * | Minor tweaks to the debian build | Thomas Dudziak | 2012-12-10 | 1 | -1/+3 |
| | | |||||
* | | Use the same output directories that SBT had in subprojects | Matei Zaharia | 2012-12-10 | 1 | -0/+2 |
|/ | | | | This will make it easier to make the "run" script work with a Maven build | ||||
* | 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 |
| | |||||
* | Include the configuration templates in the debian package | Thomas Dudziak | 2012-11-20 | 1 | -0/+11 |
| | |||||
* | Added maven and debian build files | Thomas Dudziak | 2012-11-20 | 1 | -0/+280 |