Repository: incubator-zeppelin Updated Branches: refs/heads/master 13db40852 -> 5b89ba98f
README typo, build profile addition and version bump Added interpreter/ folder to .gitignore README.md Fixed a typo in README.md Updated mvn build command for Hadoop 2.7 In spark/pom.xml: Bumped Spark default version number from 1.4.0 to 1.4.1 Added -PHadoop-2.7 build profile Author: Randy Gelhausen <[email protected]> Closes #166 from randerzander/master and squashes the following commits: d723092 [Randy Gelhausen] removed -Phadoop-2.7 build profile, updated README accordingly 879de12 [Randy Gelhausen] bumped spark/pom.xml spark.version to 1.4.1 from 1.4.0 0045b3d [Randy Gelhausen] Added .gitignore line for interpreter folder. Corrected "zeppein" typo in README, added hadoop-2.7 profile in spark/pom.xml, and adjusted hadoop-2.7 build suggestion Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/5b89ba98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/5b89ba98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/5b89ba98 Branch: refs/heads/master Commit: 5b89ba98f8ea52992cdd2e1a39ba03bb7168b311 Parents: 13db408 Author: Randy Gelhausen <[email protected]> Authored: Mon Jul 27 21:17:02 2015 -0400 Committer: Lee moon soo <[email protected]> Committed: Wed Jul 29 12:44:49 2015 +0900 ---------------------------------------------------------------------- .gitignore | 3 +++ README.md | 4 ++-- spark/pom.xml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/5b89ba98/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 75d6737..0121d25 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,9 @@ *.war *.ear +# interpreter +interpreter/ + # conf file conf/zeppelin-env.sh conf/zeppelin-site.xml http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/5b89ba98/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 6aac571..67d530e 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ mvn clean package -Pspark-1.1 -Dhadoop.version=2.6.0 -Phadoop-2.6 -Pyarn -DskipT ``` Yarn (Hadoop 2.7.x) ``` -mvn clean package -Pspark-1.1 -Dhadoop.version=2.7.0 -Phadoop-2.6 -Pyarn -DskipTests +mvn clean package -Pspark-1.4 -Dspark.version=1.4.1 -Dhadoop.version=2.7.0 -Phadoop-2.6 -Pyarn -DskipTests ``` Ignite (1.1.0-incubating and later) ``` @@ -94,7 +94,7 @@ If you wish to configure Zeppelin option (like port number), configure the follo ./conf/zeppelin-site.xml ``` (You can copy ```./conf/zeppelin-env.sh.template``` into ```./conf/zeppelin-env.sh```. -Same for ```zeppein-site.xml```.) +Same for ```zeppelin-site.xml```.) #### External cluster configuration Mesos http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/5b89ba98/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index ce435e2..9b82acb 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -35,7 +35,7 @@ <properties> - <spark.version>1.4.0</spark.version> + <spark.version>1.4.1</spark.version> <scala.version>2.10.4</scala.version> <scala.binary.version>2.10</scala.binary.version>
