diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-10-24 23:21:00 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-10-24 23:21:00 -0700 |
| commit | 863a55ae42c2b9c0583b77cf37ff13bd2459f82b (patch) | |
| tree | f4b18ebe461343ffb864dabb6afefcdf88dfafaf /.gitignore | |
| parent | ed71df46cddc9a4f1363b937c10bfa2a928e564c (diff) | |
| parent | f63a40fd99bf907c03cd44585fd5979bf21b304d (diff) | |
| download | spark-863a55ae42c2b9c0583b77cf37ff13bd2459f82b.tar.gz spark-863a55ae42c2b9c0583b77cf37ff13bd2459f82b.tar.bz2 spark-863a55ae42c2b9c0583b77cf37ff13bd2459f82b.zip | |
Merge remote-tracking branch 'public/master' into dev
Conflicts:
core/src/main/scala/spark/BlockStoreShuffleFetcher.scala
core/src/main/scala/spark/KryoSerializer.scala
core/src/main/scala/spark/MapOutputTracker.scala
core/src/main/scala/spark/RDD.scala
core/src/main/scala/spark/SparkContext.scala
core/src/main/scala/spark/executor/Executor.scala
core/src/main/scala/spark/network/Connection.scala
core/src/main/scala/spark/network/ConnectionManagerTest.scala
core/src/main/scala/spark/rdd/BlockRDD.scala
core/src/main/scala/spark/rdd/NewHadoopRDD.scala
core/src/main/scala/spark/scheduler/ShuffleMapTask.scala
core/src/main/scala/spark/scheduler/cluster/StandaloneSchedulerBackend.scala
core/src/main/scala/spark/storage/BlockManager.scala
core/src/main/scala/spark/storage/BlockMessage.scala
core/src/main/scala/spark/storage/BlockStore.scala
core/src/main/scala/spark/storage/StorageLevel.scala
core/src/main/scala/spark/util/AkkaUtils.scala
project/SparkBuild.scala
run
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index d486f58db5..f22248f40d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,8 @@ third_party/libmesos.dylib conf/java-opts conf/spark-env.sh conf/log4j.properties +docs/_site +docs/api target/ reports/ .project @@ -28,3 +30,4 @@ project/plugins/lib_managed/ project/plugins/src_managed/ logs/ log/ +spark-tests.log |