aboutsummaryrefslogtreecommitdiff
path: root/project
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Import RidgeRegression exampleMatei Zaharia2013-07-051-1/+11
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: run
* | | | | | | | | | | Removed some unnecessary code and fixed dependenciesPrashant Sharma2013-07-111-8/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' into master-mergePrashant Sharma2013-07-032-27/+73
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Twitter4J specific repo since it's in Maven centralMatei Zaharia2013-06-291-2/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Don't use forward slash in exclusion for JAR signature filesMatei Zaharia2013-06-251-1/+1
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' into streamingTathagata Das2013-06-243-36/+99
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore
| | * | | | | | | Increase memory for tests to prevent a crash on JDK 7Matei Zaharia2013-06-221-1/+1
| | | | | | | | |
| | * | | | | | | Fix some dependency issues in SBT build (same will be needed for Maven):Matei Zaharia2013-06-202-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Exclude a version of ASM 3.x that comes from HBase - Don't use a special ASF repo for HBase - Update SLF4J version - Add sbt-dependency-graph plugin so we can easily find dependency trees
| | * | | | | | | Update ASM to version 4.0Matei Zaharia2013-06-191-1/+1
| | | | | | | | |
| | * | | | | | | Merge remote-tracking branch 'milliondreams/casdemo'Matei Zaharia2013-06-181-1/+11
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: project/SparkBuild.scala
| | | * | | | | | | Adding deps to examples/pom.xmlRohit Rai2013-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing exclusion in examples deps in SparkBuild.scala
| | | * | | | | | | Adding example to make Spark RDD from CassandraRohit Rai2013-06-011-2/+2
| | | |/ / / / / /
| | * | | | | | | Merge pull request #605 from esjewett/SPARK-699Matei Zaharia2013-06-181-1/+5
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add hBase example (retry of pull request #596)
| | | * | | | | | | Add hBase exampleEthan Jewett2013-05-091-1/+5
| | | | | | | | | |
| | | * | | | | | | Revert "Merge pull request #596 from esjewett/master" because theReynold Xin2013-05-091-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependency on hbase introduces netty-3.2.2 which conflicts with netty-3.5.3 already in Spark. This caused multiple test failures. This reverts commit 0f1b7a06e1f6782711170234f105f1b277e3b04c, reversing changes made to aacca1b8a85bd073ce185a06d6470b070761b2f4.
| | | * | | | | | | HBase exampleEthan Jewett2013-05-041-1/+5
| | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Removed second version of junit test plugin from plugins.sbtMatei Zaharia2013-06-181-2/+0
| | | | | | | | |
| | * | | | | | | Add zeroLengthPartitions() test to make sure, e.g., StatCounter.scala can ↵Christopher Nguyen2013-06-151-0/+2
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | handle empty partitions without incorrectly returning NaN
| | * | | | | | Removed the duplicated netty dependency in SBT build file.Reynold Xin2013-05-161-1/+0
| | | | | | | |
| | * | | | | | Merge branch 'master' of github.com:mesos/spark into shufflemergeReynold Xin2013-05-151-1/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/spark/storage/BlockManager.scala core/src/test/scala/spark/DistributedSuite.scala project/SparkBuild.scala
| | | * \ \ \ \ \ Merge branch 'jdbc' of github.com:koeninger/sparkReynold Xin2013-05-141-1/+2
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: project/SparkBuild.scala
| | | | * | | | | add test for JdbcRDD using embedded derby, per rxin suggestionCody Koeninger2013-05-141-0/+1
| | | | | | | | |
| | * | | | | | | Merge branch 'shuffle-performance-fix-0.7' of github.com:shane-huang/spark ↵Reynold Xin2013-05-071-1/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shufflemerge Conflicts: core/src/main/scala/spark/storage/BlockManager.scala core/src/main/scala/spark/storage/DiskStore.scala project/SparkBuild.scala
| | | * | | | | | Shuffle Performance fix: Use netty embeded OIO file server instead of ↵shane-huang2013-04-071-1/+2
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConnectionManager Shuffle Performance Optimization: do not send 0-byte block requests to reduce network messages change reference from io.Source to scala.io.Source to avoid looking into io.netty package Signed-off-by: shane-huang <shengsheng.huang@intel.com>
| | * | | | | | Remove spark-repl's extraneous dependency on spark-streamingJey Kottalam2013-05-011-1/+1
| | | | | | | |
| | * | | | | | Build against Hadoop 1 by defaultMatei Zaharia2013-04-291-6/+6
| | | | | | | |
| | * | | | | | Exclude old versions of Netty, which had a different Maven organizationMatei Zaharia2013-04-251-16/+19
| | | | | | | |
| | * | | | | | Update unit test memory to 2 GBMatei Zaharia2013-04-251-1/+1
| | | | | | | |
| | * | | | | | Add back line removed during YARN mergeMatei Zaharia2013-04-251-0/+1
| | | | | | | |
| | * | | | | | Do not add signature files - results in validation errors when using ↵Mridul Muralidharan2013-04-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assembled file
| | * | | | | | Attempt at fixing merge conflictMridul Muralidharan2013-04-242-5/+5
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Pull latest SparkBuild.scala from master and merge conflictsMridul Muralidharan2013-04-241-18/+25
| | | | | | | |
| | * | | | | | Revert back to 2.0.2-alpha : 0.23.7 has protocol changes which break against ↵Mridul Muralidharan2013-04-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cloudera
| | * | | | | | Patch from Thomas Graves to improve the YARN Client, and move to more ↵Mridul Muralidharan2013-04-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | production ready hadoop yarn branch
| | * | | | | | Fix review comments, add a new api to SparkHadoopUtil to create appropriate ↵Mridul Muralidharan2013-04-221-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configuration. Modify an example to show how to use SplitInfo
| | * | | | | | Move back to 2.0.2-alpha, since 2.0.3-alpha is not available in cloudera ↵Mridul Muralidharan2013-04-171-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yet. Also, add netty dependency explicitly to prevent resolving to older 2.3x version. Additionally, comment out retrievePattern to ensure correct netty is picked up
| | * | | | | | Add support for building against hadoop2-yarn : adding new maven profile for itMridul Muralidharan2013-04-071-5/+29
| | | |/ / / / | | |/| | | |
| * | | | | | changing streaming resolver for akkaseanm2013-03-131-1/+1
| | | | | | |
| * | | | | | adding typesafe repo to streaming resolvers so that akka-zeromq is foundseanm2013-03-111-0/+3
| | | | | | |
* | | | | | | Fixed a few test issues due to Akka 2.1, as well as SBT memory.Matei Zaharia2013-06-081-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, in Akka 2.1, ActorSystem.awaitTermination hangs for remote actors, and Akka also leaves a non-daemon Netty thread even when run in daemon mode. Thus I had to comment out some of the calls to awaitTermination, and we still have one failing test.
* | | | | | | Updated to latest stable scala 2.10.1 and akka 2.1.2Prashant Sharma2013-05-011-11/+8
| | | | | | |
* | | | | | | Fixed pom.xml with updated dependencies.Prashant Sharma2013-04-291-2/+2
| | | | | | |
* | | | | | | scala 2.10 and master mergePrashant Sharma2013-04-241-4/+4
| | | | | | |
* | | | | | | Manually merged scala-2.10 and masterPrashant Sharma2013-04-223-15/+40
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Turn on forking in test JVMs to reduce the pressure on perm gen and codeMatei Zaharia2013-04-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cache sizes due to having 2 instances of the Scala compiler and a bunch of classloaders.
| * | | | | | Merge pull request #558 from ash211/patch-jackson-conflictMatei Zaharia2013-04-141-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't pull in old versions of Jackson via hadoop-core
| | * | | | | | Don't pull in old versions of Jackson via hadoop-coreAndrew Ash2013-04-091-1/+1
| | | | | | | |
| * | | | | | | Fix tests from different projects running in parallel in SBT 0.12Matei Zaharia2013-04-112-3/+5
| |/ / / / / /
| * | | | | | Merge remote-tracking branch 'jey/bump-development-version-to-0.8.0'Matei Zaharia2013-04-081-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/_config.yml project/SparkBuild.scala
| | * | | | | | Bump development version to 0.8.0Jey Kottalam2013-03-281-1/+1
| | | |/ / / / | | |/| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-13 03:51:34 +0000