diff options
| author | Prashant Sharma <scrapcodes@gmail.com> | 2013-09-15 10:55:12 +0530 |
|---|---|---|
| committer | Prashant Sharma <scrapcodes@gmail.com> | 2013-09-15 10:55:12 +0530 |
| commit | 383e151fd7138cc6a143b3a38037cc3038c2a8b9 (patch) | |
| tree | 0dbb2c0d8fdeff4c37a577eb96acb87ee7838a16 /docs/img | |
| parent | 20c65bc334091d8d05fb680551155aa182d98f7d (diff) | |
| parent | c4c1db2dd5b2ec0a8182369ecdb0e14f4e199822 (diff) | |
| download | spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.tar.gz spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.tar.bz2 spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.zip | |
Merge branch 'master' of git://github.com/mesos/spark into scala-2.10
Conflicts:
core/src/main/scala/org/apache/spark/SparkContext.scala
project/SparkBuild.scala
Diffstat (limited to 'docs/img')
| -rw-r--r-- | docs/img/cluster-overview.png | bin | 0 -> 28011 bytes |
| -rw-r--r-- | docs/img/cluster-overview.pptx | bin | 0 -> 51771 bytes |
| -rw-r--r-- | docs/img/spark-logo-hd.png | bin | 0 -> 13512 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/docs/img/cluster-overview.png b/docs/img/cluster-overview.png Binary files differnew file mode 100644 index 0000000000..368274068e --- /dev/null +++ b/docs/img/cluster-overview.png diff --git a/docs/img/cluster-overview.pptx b/docs/img/cluster-overview.pptx Binary files differnew file mode 100644 index 0000000000..af3c462cd9 --- /dev/null +++ b/docs/img/cluster-overview.pptx diff --git a/docs/img/spark-logo-hd.png b/docs/img/spark-logo-hd.png Binary files differnew file mode 100644 index 0000000000..1381e3004d --- /dev/null +++ b/docs/img/spark-logo-hd.png |
