summaryrefslogtreecommitdiff
path: root/faq.md
diff options
context:
space:
mode:
authorMatei Alexandru Zaharia <matei@apache.org>2013-08-28 22:15:48 +0000
committerMatei Alexandru Zaharia <matei@apache.org>2013-08-28 22:15:48 +0000
commit65f7cc03c77ca02da9a19f2e63f518882e5c59d1 (patch)
tree302b5af8b4f2d167265dd71045c80961f455d536 /faq.md
parent61c4bb4aeaa1cfcd261b560dae4351a8f450909b (diff)
downloadspark-website-65f7cc03c77ca02da9a19f2e63f518882e5c59d1.tar.gz
spark-website-65f7cc03c77ca02da9a19f2e63f518882e5c59d1.tar.bz2
spark-website-65f7cc03c77ca02da9a19f2e63f518882e5c59d1.zip
Updated FAQ about license
Diffstat (limited to 'faq.md')
-rw-r--r--faq.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/faq.md b/faq.md
index 14a44478f..fcb889c3e 100644
--- a/faq.md
+++ b/faq.md
@@ -29,11 +29,12 @@ navigation:
<p>Spark 0.6 also added a <a href="{{site.url}}docs/latest/java-programming-guide.html">Java API</a>, letting you use Spark from Java, and Spark 0.7 added a <a href="{{site.url}}docs/latest/python-programming-guide.html">Python API</a>.</p>
<p class="question">What license is Spark under?</p>
-<p class="answer">Spark is open source under the liberal <a href="https://github.com/mesos/spark/blob/master/LICENSE">BSD license</a>.</p>
+
+<p class="answer">Starting in version 0.8, Spark will be under the <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2.0 license</a>. Previous versions used the <a href="https://github.com/mesos/spark/blob/branch-0.7/LICENSE">BSD license</a>.</p>
<p class="question">How can I contribute to Spark?</p>
<p class="answer">Contact the <a href="http://groups.google.com/group/spark-users">mailing list</a> or send us a pull request on GitHub. We're glad to hear about your experience using Spark and to accept patches </p>
<p>If you would like to report an issue, post it to the <a href="https://spark-project.atlassian.net/browse/SPARK">Spark issue tracker</a>.</p>
<p class="question">Where can I get more help?</p>
-<p class="answer">Please post on the <a href="http://groups.google.com/group/spark-users">spark-users</a> mailing list. We'll be glad to help!</p> \ No newline at end of file
+<p class="answer">Please post on the <a href="http://groups.google.com/group/spark-users">spark-users</a> mailing list. We'll be glad to help!</p>