diff options
| author | Matei Zaharia <matei@databricks.com> | 2013-12-31 18:23:14 -0500 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2013-12-31 18:23:14 -0500 |
| commit | ba9338f104ccc71d4f342a3f96624a9b36895f48 (patch) | |
| tree | 5a5b2bf6b34565a594a68fff59b9dd2af234be7f /sbt | |
| parent | 0fa5809768cf60ec62b4277f04e23a44dc1582e2 (diff) | |
| parent | 63b411dd8664c27ac55586d8345733afad80961f (diff) | |
| download | spark-ba9338f104ccc71d4f342a3f96624a9b36895f48.tar.gz spark-ba9338f104ccc71d4f342a3f96624a9b36895f48.tar.bz2 spark-ba9338f104ccc71d4f342a3f96624a9b36895f48.zip | |
Merge remote-tracking branch 'apache/master' into conf2
Conflicts:
core/src/main/scala/org/apache/spark/rdd/CheckpointRDD.scala
streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala
streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala
Diffstat (limited to 'sbt')
0 files changed, 0 insertions, 0 deletions