diff options
| author | Tathagata Das <tathagata.das1565@gmail.com> | 2013-02-20 09:01:29 -0800 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2013-02-20 09:01:29 -0800 |
| commit | fb9956256d19b9f8f79de43099d2b5fc851bcf08 (patch) | |
| tree | 8a4bd96ce7f122342dcdc11626dae46b90e0c24c /project/build.properties | |
| parent | 7e30c46aaf337eb95c9ec37ddc2ad79439430c96 (diff) | |
| parent | 03d847999e8c54684128573b94973544026081b2 (diff) | |
| download | spark-fb9956256d19b9f8f79de43099d2b5fc851bcf08.tar.gz spark-fb9956256d19b9f8f79de43099d2b5fc851bcf08.tar.bz2 spark-fb9956256d19b9f8f79de43099d2b5fc851bcf08.zip | |
Merge branch 'mesos-master' into streaming
Conflicts:
core/src/main/scala/spark/rdd/CheckpointRDD.scala
streaming/src/main/scala/spark/streaming/dstream/ReducedWindowedDStream.scala
Diffstat (limited to 'project/build.properties')
0 files changed, 0 insertions, 0 deletions