You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by js...@apache.org on 2017/06/27 06:38:46 UTC

[05/50] [abbrv] incubator-livy git commit: Revert "LIVY-255. Update the docs for Livy build and Spark2 support"

Revert "LIVY-255. Update the docs for Livy build and Spark2 support"


Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/2da435ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/2da435ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/2da435ad

Branch: refs/heads/revert-237-LIVY-255
Commit: 2da435ad1d8b43b7e5b3c6eece57c096a7126a20
Parents: dbdad9d
Author: Jeff Zhang <zj...@gmail.com>
Authored: Wed Nov 30 14:25:32 2016 +0800
Committer: GitHub <no...@github.com>
Committed: Wed Nov 30 14:25:32 2016 +0800

----------------------------------------------------------------------
 README.rst | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/2da435ad/README.rst
----------------------------------------------------------------------
diff --git a/README.rst b/README.rst
index a8f58ac..b23136a 100644
--- a/README.rst
+++ b/README.rst
@@ -51,14 +51,8 @@ Required python packages for building Livy:
 
 
 To run Livy, you will also need a Spark installation. You can get Spark releases at
-https://spark.apache.org/downloads.html.
-
-Livy requires at least Spark 1.6 and supports both Scala 2.10 and 2.11 builds of Spark, Livy
-will automatically pick repl dependencies through detecting the Scala version of Spark.
-
-Livy also supports Spark 2.0+ for both interactive and batch submission, you could seamlessly
-switch to different versions of Spark through ``SPARK_HOME`` configuration, without needing to
-rebuild Livy.
+https://spark.apache.org/downloads.html. Livy requires at least Spark 1.6 and currently
+only supports Scala 2.10 builds of Spark.
 
 
 Building Livy
@@ -72,11 +66,16 @@ Livy is built using `Apache Maven`_. To check out and build Livy, run:
     cd livy
     mvn package
 
-By default Livy is built against Apache Spark 1.6.2, but the version of Spark used when running
-Livy does not need to match the version used to build Livy. Livy internally uses reflection to
-mitigate the gaps between different Spark versions, also Livy package itself does not
-contain a Spark distribution, so it will work with any supported version of Spark (Spark 1.6+)
-without needing to rebuild against specific version of Spark.
+By default Livy is built against the CDH 5.5 distribution of Spark (based off Spark 1.5.0). You can
+build Livy against a different version of Spark by setting the ``spark.version`` property:
+
+.. code:: shell
+
+    mvn -Dspark.version=1.6.1 package
+
+The version of Spark used when running Livy does not need to match the version used to build Livy.
+The Livy package itself does not contain a Spark distribution, and will work with any supported
+version of Spark.
 
 .. _Apache Maven: http://maven.apache.org