Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into scala-2.10 | Raymond Liu | 2013-11-14 | 1 | -2/+34 |
|\ | |||||
| * | Propagate the SparkContext local property from the thread that calls the ↵ | Reynold Xin | 2013-11-09 | 2 | -4/+42 |
| | | | | | | | | spark-repl to the actual execution thread. | ||||
* | | Merge branch 'master' into scala-2.10 | Raymond Liu | 2013-11-13 | 1 | -7/+29 |
|\| | |||||
| * | Makes Spark SIMR ready. | Ali Ghodsi | 2013-10-24 | 1 | -0/+14 |
| | | |||||
| * | Spark shell exits if it cannot create SparkContext | Aaron Davidson | 2013-10-17 | 1 | -1/+8 |
| | | | | | | | | | | | | Mainly, this occurs if you provide a messed up MASTER url (one that doesn't match one of our regexes). Previously, we would default to Mesos, fail, and then start the shell anyway, except that any Spark command would fail. | ||||
* | | 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 | 2 | -2/+2 |
|\| | | | | | | | | | | | | | | | 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 |
| | | |||||
| * | Update build version in master | Patrick Wendell | 2013-09-24 | 1 | -1/+1 |
| | | |||||
* | | fixed maven build for scala 2.10 | Prashant Sharma | 2013-09-26 | 1 | -6/+6 |
| | | |||||
* | | ported repl improvements from master | Prashant Sharma | 2013-09-15 | 2 | -2/+11 |
| | | |||||
* | | 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 |
| | | |||||
* | | Fixed repl suite | Prashant Sharma | 2013-09-15 | 2 | -7/+7 |
| | | |||||
* | | Few more fixes to tests broken during merge | Prashant Sharma | 2013-09-10 | 1 | -50/+0 |
| | | |||||
* | | Merged with master | Prashant Sharma | 2013-09-06 | 18 | -372/+369 |
|\| | |||||
| * | Updated LICENSE with third-party licenses | Matei Zaharia | 2013-09-02 | 1 | -0/+17 |
| | | |||||
| * | Move some classes to more appropriate packages: | Matei Zaharia | 2013-09-01 | 1 | -1/+1 |
| | | | | | | | | | | | | * RDD, *RDDFunctions -> org.apache.spark.rdd * Utils, ClosureCleaner, SizeEstimator -> org.apache.spark.util * JavaSerializer, KryoSerializer -> org.apache.spark.serializer | ||||
| * | 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 | 12 | -30/+30 |
| | | |||||
| * | 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 |
| | | |||||
| * | Format cleanup. | Benjamin Hindman | 2013-07-30 | 1 | -1/+3 |
| | | |||||
| * | Added property 'spark.executor.uri' for launching on Mesos without | Benjamin Hindman | 2013-07-29 | 1 | -0/+2 |
| | | | | | | | | | | | | | | requiring Spark to be installed. Using 'make_distribution.sh' a user can put a Spark distribution at a URI supported by Mesos (e.g., 'hdfs://...') and then set that when launching their job. Also added SPARK_EXECUTOR_URI for the REPL. | ||||
| * | Add Apache license headers and LICENSE and NOTICE files | Matei Zaharia | 2013-07-16 | 5 | -1/+86 |
| | | |||||
* | | Added add jars functionality to new repl, which was dropped while merging ↵ | Prashant Sharma | 2013-07-12 | 3 | -4/+11 |
| | | | | | | | | with old. | ||||
* | | Removed an unnecessary test case | Prashant Sharma | 2013-07-11 | 1 | -101/+0 |
| | | |||||
* | | Merge branch 'master' into master-merge | Prashant Sharma | 2013-07-03 | 3 | -14/+91 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Formatting | Matei Zaharia | 2013-06-25 | 1 | -3/+4 |
| | | |||||
| * | Added a local-cluster mode test to ReplSuite | Matei Zaharia | 2013-06-25 | 1 | -5/+26 |
| | | |||||
| * | Fix search path for REPL class loader to really find added JARs | Matei Zaharia | 2013-06-22 | 1 | -1/+3 |
| | | |||||
| * | ADD_JARS environment variable for spark-shell | Matei Zaharia | 2013-06-22 | 1 | -2/+7 |
| | | |||||
| * | Update ASM to version 4.0 | Matei Zaharia | 2013-06-19 | 1 | -2/+1 |
| | | |||||
| * | Remove spark-repl's extraneous dependency on spark-streaming | Jey Kottalam | 2013-05-01 | 1 | -14/+0 |
| | | |||||
| * | Attempt to fix streaming test failures after yarn branch merge | Mridul Muralidharan | 2013-04-28 | 1 | -0/+1 |
| | | |||||
| * | Attempt at fixing merge conflict | Mridul Muralidharan | 2013-04-24 | 2 | -2/+2 |
| |\ | |||||
| * | | Add support for building against hadoop2-yarn : adding new maven profile for it | Mridul Muralidharan | 2013-04-07 | 1 | -0/+71 |
| | | | |||||
* | | | Merge pull request #652 from ScrapCodes/scala-2.10 | Matei Zaharia | 2013-06-14 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Fixed maven build without netty fix | ||||
| * | | | Fixed maven build without netty fix | Prashant Sharma | 2013-06-14 | 1 | -0/+2 |
| | | | | |||||
* | | | | Fix StandaloneClusterReplSuite to allow running multiple tests | Matei Zaharia | 2013-06-08 | 2 | -16/+5 |
|/ / / | |||||
* | | | Fixied other warnings | Prashant Sharma | 2013-04-29 | 1 | -1/+1 |
| | | | |||||
* | | | scala 2.10 and master merge | Prashant Sharma | 2013-04-24 | 3 | -16/+2 |
| | | | |||||
* | | | Manually merged scala-2.10 and master | Prashant Sharma | 2013-04-22 | 3 | -16/+44 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge remote-tracking branch 'jey/bump-development-version-to-0.8.0' | Matei Zaharia | 2013-04-08 | 2 | -2/+2 |
| |\ \ | | |/ | |/| | | | | | | | | | | Conflicts: docs/_config.yml project/SparkBuild.scala |