aboutsummaryrefslogtreecommitdiff
path: root/docker/README.md
diff options
context:
space:
mode:
authorKarthikTunga <karthik.tunga@gmail.com>2013-10-15 00:46:35 -0700
committerKarthikTunga <karthik.tunga@gmail.com>2013-10-15 00:46:35 -0700
commit6c6b146fc20f2ba85f1cf1bb9e35283ee195f59a (patch)
treef0c5819f78e3186206d6c79064155c3751711b66 /docker/README.md
parentd2c86e718891b40e1cea8b0719462673b6b64e4e (diff)
parente33b1839e27249e232a2126cec67a38109e03243 (diff)
downloadspark-6c6b146fc20f2ba85f1cf1bb9e35283ee195f59a.tar.gz
spark-6c6b146fc20f2ba85f1cf1bb9e35283ee195f59a.tar.bz2
spark-6c6b146fc20f2ba85f1cf1bb9e35283ee195f59a.zip
Merge branch 'master' of https://github.com/apache/incubator-spark
Updating local branch
Diffstat (limited to 'docker/README.md')
-rw-r--r--docker/README.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 0000000000..bf59e77d11
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,5 @@
+Spark docker files
+===========
+
+Drawn from Matt Massie's docker files (https://github.com/massie/dockerfiles),
+as well as some updates from Andre Schumacher (https://github.com/AndreSchumacher/docker). \ No newline at end of file