diff options
author | Patrick Wendell <pwendell@gmail.com> | 2013-07-31 21:35:12 -0700 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2013-07-31 21:35:12 -0700 |
commit | 5cc725a0e3ef523affae8ff54dd74707e49d64e3 (patch) | |
tree | ebd1698333d2df4194f17a9ea93a2f2eac2c7acd /NOTICE | |
parent | b7b627d5bb1a1331ea580950834533f84735df4c (diff) | |
parent | f3cf09491a2b63e19a15e98cf815da503e4fb69b (diff) | |
download | spark-5cc725a0e3ef523affae8ff54dd74707e49d64e3.tar.gz spark-5cc725a0e3ef523affae8ff54dd74707e49d64e3.tar.bz2 spark-5cc725a0e3ef523affae8ff54dd74707e49d64e3.zip |
Merge branch 'master' into ec2-updates
Conflicts:
ec2/deploy.generic/root/mesos-ec2/ec2-variables.sh
Diffstat (limited to 'NOTICE')
-rw-r--r-- | NOTICE | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000000..7cbb114b2a --- /dev/null +++ b/NOTICE @@ -0,0 +1,5 @@ +Apache Spark +Copyright 2013 The Apache Software Foundation. + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). |