Prashant Sharma
9d7781c4e1
Adding commons io as dependency
2013-07-15 12:03:48 +05:30
Prashant Sharma
a3494d405d
Merge branch 'master' of github.com:mesos/spark into scala-2.10
...
Conflicts:
core/src/main/scala/spark/Utils.scala
core/src/test/scala/spark/ui/UISuite.scala
project/SparkBuild.scala
run
2013-07-15 11:15:55 +05:30
Matei Zaharia
668b0dc6a7
Merge branch 'master' of github.com:mesos/spark
2013-07-13 19:10:46 -07:00
Matei Zaharia
cd28d9c147
Merge remote-tracking branch 'origin/pr/662'
...
Conflicts:
bin/compute-classpath.sh
2013-07-13 19:10:00 -07:00
seanm
c4d5b01e44
changing com.google.code.findbugs maven coordinates
2013-07-13 14:56:23 -06:00
Prashant Sharma
e86d5dbaad
Merge branch 'master' into master-merge
...
Conflicts:
README.md
core/pom.xml
core/src/main/scala/spark/deploy/JsonProtocol.scala
core/src/main/scala/spark/deploy/LocalSparkCluster.scala
core/src/main/scala/spark/deploy/master/Master.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/storage/BlockManagerUI.scala
core/src/main/scala/spark/util/AkkaUtils.scala
pom.xml
project/SparkBuild.scala
streaming/src/main/scala/spark/streaming/receivers/ActorReceiver.scala
2013-07-12 14:49:16 +05:30
Prashant Sharma
69ae7ea227
Removed some unnecessary code and fixed dependencies
2013-07-11 18:30:18 +05:30
Matei Zaharia
3cc6818f13
Merge pull request #668 from shimingfei/guava-14.0.1
...
update guava version from 11.0.1 to 14.0.1
2013-07-06 19:51:20 -07:00
Matei Zaharia
1ffadb2d9e
Merge remote-tracking branch 'pwendell/ui-updates'
...
Conflicts:
core/src/main/scala/spark/scheduler/DAGScheduler.scala
core/src/main/scala/spark/util/AkkaUtils.scala
pom.xml
2013-07-06 15:51:41 -07:00
Matei Zaharia
43b24635ee
Renamed ML package to MLlib and added it to classpath
2013-07-05 11:38:53 -07:00
Matei Zaharia
05be233ce2
Removed dependency on Apache Commons Math
2013-07-05 11:13:46 -07:00
Reynold Xin
6a9a9a364c
Minor clean up of the RidgeRegression code. I am not even sure why I did
...
this :s.
2013-07-05 11:13:45 -07:00
Matei Zaharia
729e463f64
Import RidgeRegression example
...
Conflicts:
run
2013-07-05 11:13:41 -07:00
Mingfei
04567a1771
update guava version from 11.0.1 to 14.0.1
2013-07-03 17:43:37 +08:00
Prashant Sharma
a5f1f6a907
Merge branch 'master' into master-merge
...
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
2013-07-03 11:43:26 +05:30
Matei Zaharia
5cfcd3c336
Remove Twitter4J specific repo since it's in Maven central
2013-06-29 15:37:27 -07:00
Evan Chan
1107b4d55b
Merge branch 'master' into 2013-06/assembly-jar-deploy
...
Conflicts:
run
Previous changes that I made to run and set-dev-classpath.sh instead
have been folded into compute-classpath.sh
2013-06-28 17:18:35 -07:00
Matei Zaharia
32370da4e4
Don't use forward slash in exclusion for JAR signature files
2013-06-25 22:08:19 -04:00
Evan Chan
d2f46ac680
Merge branch 'master' into 2013-06/assembly-jar-deploy
...
Conflicts:
run
2013-06-25 14:50:16 -07:00
Tathagata Das
c89af0a7f9
Merge branch 'master' into streaming
...
Conflicts:
.gitignore
2013-06-24 23:57:47 -07:00
Patrick Wendell
91ec5a1a04
Changing JSON protocol and removing spray code
2013-06-22 10:31:36 -07:00
Matei Zaharia
b350f34703
Increase memory for tests to prevent a crash on JDK 7
2013-06-22 07:48:20 -07:00
Evan Chan
071ff7efa1
Enable building a fat jar for the Spark REPL
2013-06-20 17:53:23 -07:00
Matei Zaharia
ae7a5da6b3
Fix some dependency issues in SBT build (same will be needed for Maven):
...
- 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
2013-06-20 18:44:46 +02:00
Matei Zaharia
7902baddc7
Update ASM to version 4.0
2013-06-19 13:34:30 +02:00
Matei Zaharia
dbfab49d2a
Merge remote-tracking branch 'milliondreams/casdemo'
...
Conflicts:
project/SparkBuild.scala
2013-06-18 14:55:31 +02:00
Matei Zaharia
73f4c7d2d1
Merge pull request #605 from esjewett/SPARK-699
...
Add hBase example (retry of pull request #596 )
2013-06-18 04:21:17 -07:00
Matei Zaharia
5b5b5aedbf
Fixed a few test issues due to Akka 2.1, as well as SBT memory.
...
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.
2013-06-08 01:09:24 -07:00
Rohit Rai
6d8423fd1b
Adding deps to examples/pom.xml
...
Fixing exclusion in examples deps in SparkBuild.scala
2013-06-02 13:03:45 +05:30
Rohit Rai
3be7bdcefd
Adding example to make Spark RDD from Cassandra
2013-06-01 19:32:17 +05:30
Reynold Xin
f742435f18
Removed the duplicated netty dependency in SBT build file.
2013-05-16 14:31:03 -07:00
Reynold Xin
f3491cb89b
Merge branch 'master' of github.com:mesos/spark into shufflemerge
...
Conflicts:
core/src/main/scala/spark/storage/BlockManager.scala
core/src/test/scala/spark/DistributedSuite.scala
project/SparkBuild.scala
2013-05-15 00:31:52 -07:00
Reynold Xin
81ad2fa331
Merge branch 'jdbc' of github.com:koeninger/spark
...
Conflicts:
project/SparkBuild.scala
2013-05-14 23:12:00 -07:00
Cody Koeninger
b16c4896f6
add test for JdbcRDD using embedded derby, per rxin suggestion
2013-05-14 23:44:04 -05:00
Ethan Jewett
ee6f6aa6cd
Add hBase example
2013-05-09 18:33:38 -05:00
Reynold Xin
012c9e5ab0
Revert "Merge pull request #596 from esjewett/master" because the
...
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 0f1b7a06e1
, reversing
changes made to aacca1b8a8
.
2013-05-09 14:20:01 -07:00
Reynold Xin
90577ada69
Merge branch 'shuffle-performance-fix-0.7' of github.com:shane-huang/spark into shufflemerge
...
Conflicts:
core/src/main/scala/spark/storage/BlockManager.scala
core/src/main/scala/spark/storage/DiskStore.scala
project/SparkBuild.scala
2013-05-07 15:56:19 -07:00
Ethan Jewett
02e8cfa617
HBase example
2013-05-04 12:31:30 -05:00
Jey Kottalam
207afe4088
Remove spark-repl's extraneous dependency on spark-streaming
2013-05-01 16:57:31 -07:00
Prashant Sharma
4041a2689e
Updated to latest stable scala 2.10.1 and akka 2.1.2
2013-05-01 11:35:35 +05:30
Matei Zaharia
f1f92c88eb
Build against Hadoop 1 by default
2013-04-29 17:08:45 -07:00
Prashant Sharma
4b4a36ea7d
Fixed pom.xml with updated dependencies.
2013-04-29 12:55:43 +05:30
Matei Zaharia
1b169f190c
Exclude old versions of Netty, which had a different Maven organization
2013-04-25 19:52:12 -07:00
Matei Zaharia
eef9ea1993
Update unit test memory to 2 GB
2013-04-25 00:42:29 -07:00
Matei Zaharia
01d9ba5038
Add back line removed during YARN merge
2013-04-25 00:11:27 -07:00
Prashant Sharma
ad88f083a6
scala 2.10 and master merge
2013-04-24 18:08:26 +05:30
Mridul Muralidharan
3b594a4e3b
Do not add signature files - results in validation errors when using assembled file
2013-04-24 10:18:25 +05:30
Mridul Muralidharan
adcda84f96
Pull latest SparkBuild.scala from master and merge conflicts
2013-04-24 08:57:25 +05:30
Mridul Muralidharan
5b85c715c8
Revert back to 2.0.2-alpha : 0.23.7 has protocol changes which break against cloudera
2013-04-24 02:57:51 +05:30
Mridul Muralidharan
8faf5c51c3
Patch from Thomas Graves to improve the YARN Client, and move to more production ready hadoop yarn branch
2013-04-24 02:31:57 +05:30