[2/2] zeppelin git commit: Preparing development version 0.8.1-SNAPSHOT
Preparing development version 0.8.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9f8dd540 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9f8dd540 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9f8dd540 Branch: refs/heads/branch-0.8 Commit: 9f8dd540ce55296e908c2ec9ecd7434831684fdb Parents: 52c46fa Author: Jeff Zhang Authored: Fri Apr 27 14:19:09 2018 +0800 Committer: Jeff Zhang Committed: Fri Apr 27 14:19:09 2018 +0800 -- alluxio/pom.xml | 4 ++-- angular/pom.xml | 4 ++-- beam/pom.xml| 4 ++-- bigquery/pom.xml| 4 ++-- cassandra/pom.xml | 4 ++-- elasticsearch/pom.xml | 4 ++-- file/pom.xml| 4 ++-- flink/pom.xml | 4 ++-- geode/pom.xml | 4 ++-- groovy/pom.xml | 4 ++-- hbase/pom.xml | 4 ++-- helium-dev/pom.xml | 4 ++-- ignite/pom.xml | 4 ++-- interpreter-parent/pom.xml | 4 ++-- jdbc/pom.xml| 4 ++-- kylin/pom.xml | 4 ++-- lens/pom.xml| 4 ++-- livy/pom.xml| 4 ++-- markdown/pom.xml| 4 ++-- neo4j/pom.xml | 4 ++-- pig/pom.xml | 4 ++-- pom.xml | 2 +- python/pom.xml | 4 ++-- r/pom.xml | 4 ++-- sap/pom.xml | 4 ++-- scalding/pom.xml| 4 ++-- scio/pom.xml| 4 ++-- shell/pom.xml | 4 ++-- spark/interpreter/pom.xml | 4 ++-- spark/pom.xml | 4 ++-- spark/scala-2.10/pom.xml| 4 ++-- spark/scala-2.11/pom.xml| 4 ++-- spark/spark-dependencies/pom.xml| 4 ++-- spark/spark-scala-parent/pom.xml| 4 ++-- spark/spark-shims/pom.xml | 4 ++-- spark/spark1-shims/pom.xml | 4 ++-- spark/spark2-shims/pom.xml | 4 ++-- zeppelin-display/pom.xml| 4 ++-- zeppelin-distribution/pom.xml | 2 +- zeppelin-examples/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-clock/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-horizontalbar/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-spell-echo/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-flowchart/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-markdown/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-translator/pom.xml | 4 ++-- zeppelin-integration/pom.xml| 4 ++-- zeppelin-interpreter/pom.xml| 4 ++-- zeppelin-jupyter/pom.xml| 4 ++-- zeppelin-server/pom.xml | 4 ++-- zeppelin-web/pom.xml| 4 ++-- zeppelin-zengine/pom.xml| 4 ++-- 52 files changed, 102 insertions(+), 102 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9f8dd540/alluxio/pom.xml -- diff --git a/alluxio/pom.xml b/alluxio/pom.xml index b6a4876..acef494 100644 --- a/alluxio/pom.xml +++ b/alluxio/pom.xml @@ -22,14 +22,14 @@ interpreter-parent org.apache.zeppelin -0.8.0 +0.8.1-SNAPSHOT ../interpreter-parent org.apache.zeppelin zeppelin-alluxio jar -0.8.0 +0.8.1-SNAPSHOT Zeppelin: Alluxio interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9f8dd540
[1/2] zeppelin git commit: Preparing Apache Zeppelin release 0.8.0
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 4d4e415a4 -> 9f8dd540c Preparing Apache Zeppelin release 0.8.0 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/52c46fa9 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/52c46fa9 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/52c46fa9 Branch: refs/heads/branch-0.8 Commit: 52c46fa926098178305657530c710d5d29374fd0 Parents: 4d4e415 Author: Jeff Zhang Authored: Fri Apr 27 14:19:02 2018 +0800 Committer: Jeff Zhang Committed: Fri Apr 27 14:19:02 2018 +0800 -- alluxio/pom.xml | 4 ++-- angular/pom.xml | 4 ++-- beam/pom.xml| 4 ++-- bigquery/pom.xml| 4 ++-- cassandra/pom.xml | 4 ++-- elasticsearch/pom.xml | 4 ++-- file/pom.xml| 4 ++-- flink/pom.xml | 4 ++-- geode/pom.xml | 4 ++-- groovy/pom.xml | 4 ++-- hbase/pom.xml | 4 ++-- helium-dev/pom.xml | 4 ++-- ignite/pom.xml | 4 ++-- interpreter-parent/pom.xml | 4 ++-- jdbc/pom.xml| 4 ++-- kylin/pom.xml | 4 ++-- lens/pom.xml| 4 ++-- livy/pom.xml| 4 ++-- markdown/pom.xml| 4 ++-- neo4j/pom.xml | 4 ++-- pig/pom.xml | 4 ++-- pom.xml | 2 +- python/pom.xml | 4 ++-- r/pom.xml | 4 ++-- sap/pom.xml | 4 ++-- scalding/pom.xml| 4 ++-- scio/pom.xml| 4 ++-- shell/pom.xml | 4 ++-- spark/interpreter/pom.xml | 4 ++-- spark/pom.xml | 4 ++-- spark/scala-2.10/pom.xml| 4 ++-- spark/scala-2.11/pom.xml| 4 ++-- spark/spark-dependencies/pom.xml| 4 ++-- spark/spark-scala-parent/pom.xml| 4 ++-- spark/spark-shims/pom.xml | 4 ++-- spark/spark1-shims/pom.xml | 4 ++-- spark/spark2-shims/pom.xml | 4 ++-- zeppelin-display/pom.xml| 4 ++-- zeppelin-distribution/pom.xml | 2 +- zeppelin-examples/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-clock/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-horizontalbar/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-spell-echo/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-flowchart/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-markdown/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-translator/pom.xml | 4 ++-- zeppelin-integration/pom.xml| 4 ++-- zeppelin-interpreter/pom.xml| 4 ++-- zeppelin-jupyter/pom.xml| 4 ++-- zeppelin-server/pom.xml | 4 ++-- zeppelin-web/pom.xml| 4 ++-- zeppelin-zengine/pom.xml| 4 ++-- 52 files changed, 102 insertions(+), 102 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/52c46fa9/alluxio/pom.xml -- diff --git a/alluxio/pom.xml b/alluxio/pom.xml index acef494..b6a4876 100644 --- a/alluxio/pom.xml +++ b/alluxio/pom.xml @@ -22,14 +22,14 @@ interpreter-parent org.apache.zeppelin -0.8.1-SNAPSHOT +0.8.0 ../interpreter-parent org.apache.zeppelin zeppelin-alluxio jar -0.8.1-SNAPSHOT +0.8.0 Zeppelin: Alluxio
[zeppelin] Git Push Summary
Repository: zeppelin Updated Tags: refs/tags/v0.8.0-rc1 [created] 52c46fa92
zeppelin git commit: ZEPPELIN-3325. R interpreter build bugfix
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 cae48c39f -> 4d4e415a4 ZEPPELIN-3325. R interpreter build bugfix ### What is this PR for? Cherry pick from master bran h. Failing to build R interpreter (-Pr) after Spark refactoring ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-3325 How should this be tested? mvn clean package --batch-mode package -Phelium-dev -Pscala-2.11 -Dscala.version=2.11.8 -Dscala.binary.version=2.11 -Pbuild-distr -Pspark-2.1 -Dspark.version=2.1.1 -Pr -Phadoop-2.7 -Dhadoop.version=2.7.3 -Dmaven.findbugs.enable=false -Drat.skip=true -Dcheckstyle.skip=true -DskipTests Questions: Does the licenses files need update? N Is there breaking changes for older versions? N Does this needs documentation? N Author: Jeff Zhang Closes #2949 from zjffdu/ZEPPELIN-3325 and squashes the following commits: bad6e70 [Jeff Zhang] ZEPPELIN-3325. R interpreter build bugfix 3a3475b [Jeff Zhang] Preparing development version 0.8.1-SNAPSHOT 283b624 [Jeff Zhang] Preparing Apache Zeppelin release 0.8.0 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/4d4e415a Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/4d4e415a Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/4d4e415a Branch: refs/heads/branch-0.8 Commit: 4d4e415a4454bb15547f686b104b356c3713a913 Parents: cae48c3 Author: Jeff Zhang Authored: Fri Apr 27 10:24:50 2018 +0800 Committer: Jeff Zhang Committed: Fri Apr 27 14:14:32 2018 +0800 -- .travis.yml | 6 +++--- alluxio/pom.xml | 4 ++-- angular/pom.xml | 4 ++-- beam/pom.xml | 4 ++-- bigquery/pom.xml | 4 ++-- cassandra/pom.xml | 4 ++-- docs/_config.yml | 4 ++-- elasticsearch/pom.xml | 4 ++-- file/pom.xml | 4 ++-- flink/pom.xml | 4 ++-- geode/pom.xml | 4 ++-- groovy/pom.xml| 4 ++-- hbase/pom.xml | 4 ++-- helium-dev/pom.xml| 4 ++-- ignite/pom.xml| 4 ++-- interpreter-parent/pom.xml| 4 ++-- jdbc/pom.xml | 4 ++-- kylin/pom.xml | 4 ++-- lens/pom.xml | 4 ++-- livy/pom.xml | 4 ++-- markdown/pom.xml | 4 ++-- neo4j/pom.xml | 4 ++-- pig/pom.xml | 4 ++-- pom.xml | 2 +- python/pom.xml| 4 ++-- r/pom.xml | 14 -- sap/pom.xml | 4 ++-- scalding/pom.xml | 4 ++-- scio/pom.xml | 4 ++-- scripts/docker/zeppelin/bin/Dockerfile| 2 +- shell/pom.xml | 4 ++-- spark/interpreter/pom.xml | 4 ++-- spark/pom.xml | 4 ++-- spark/scala-2.10/pom.xml | 4 ++-- spark/scala-2.11/pom.xml | 4 ++-- spark/spark-dependencies/pom.xml | 4 ++-- spark/spark-scala-parent/pom.xml | 4 ++-- spark/spark-shims/pom.xml | 4 ++-- spark/spark1-shims/pom.xml| 4 ++-- spark/spark2-shims/pom.xml| 4 ++-- zeppelin-display/pom.xml | 4 ++-- zeppelin-distribution/pom.xml | 2 +- zeppelin-examples/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-clock/pom.xml | 4 ++-- .../zeppelin-example-clock.json | 2 +- .../zeppelin-example-horizontalbar/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-spell-echo/pom.xml | 4 ++-- .../zeppelin-example-spell-flowchart/pom.xml | 4 ++-- .../zeppelin-example-spell-markdown/pom.xml | 4 ++-- .../zeppelin-example-spell-translator/pom.xml | 4 ++-- zeppelin-integration/pom.xml | 4
[zeppelin] Git Push Summary
Repository: zeppelin Updated Tags: refs/tags/v0.8.0-rc1 [deleted] 793052eec
[zeppelin] Git Push Summary [forced push!] [Forced Update!]
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 793052eec -> cae48c39f (forced update)
[zeppelin] Git Push Summary
Repository: zeppelin Updated Tags: refs/tags/v0.8.0-rc1 [created] 793052eec
zeppelin git commit: ZEPPELIN-3325. R interpreter build bugfix
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 3a3475b62 -> 793052eec ZEPPELIN-3325. R interpreter build bugfix ### What is this PR for? Cherry pick from master bran h. Failing to build R interpreter (-Pr) after Spark refactoring ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-3325 How should this be tested? mvn clean package --batch-mode package -Phelium-dev -Pscala-2.11 -Dscala.version=2.11.8 -Dscala.binary.version=2.11 -Pbuild-distr -Pspark-2.1 -Dspark.version=2.1.1 -Pr -Phadoop-2.7 -Dhadoop.version=2.7.3 -Dmaven.findbugs.enable=false -Drat.skip=true -Dcheckstyle.skip=true -DskipTests Questions: Does the licenses files need update? N Is there breaking changes for older versions? N Does this needs documentation? N Author: Jeff Zhang Closes #2949 from zjffdu/ZEPPELIN-3325 and squashes the following commits: bad6e70 [Jeff Zhang] ZEPPELIN-3325. R interpreter build bugfix Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/793052ee Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/793052ee Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/793052ee Branch: refs/heads/branch-0.8 Commit: 793052eec3016b27758de01da6679129a39da065 Parents: 3a3475b Author: Jeff Zhang Authored: Fri Apr 27 10:24:50 2018 +0800 Committer: Jeff Zhang Committed: Fri Apr 27 13:14:44 2018 +0800 -- .travis.yml | 6 +++--- r/pom.xml | 12 +++- 2 files changed, 10 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/793052ee/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 451b45a..7561a48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,7 +81,7 @@ matrix: env: PYTHON="3" SCALA_VER="2.10" PROFILE="-Pscalding" BUILD_FLAG="package -DskipTests -DskipRat -Pr" TEST_FLAG="test -DskipRat" MODULES="-pl $(echo .,zeppelin-interpreter,${INTERPRETERS} | sed 's/!//g')" TEST_PROJECTS="" # Run ZeppelinSparkClusterTest & SparkIntegrationTest in one build would exceed the time limitation of travis, so running them separately - + # Integration test of spark interpreter with different spark versions under python2, only run ZeppelinSparkClusterTest. Also run spark unit test of spark 2.2 in this build. - sudo: required jdk: "oraclejdk8" @@ -97,12 +97,12 @@ matrix: # Test spark module for 2.1.0 with scala 2.11 - jdk: "openjdk7" dist: trusty - env: PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.1 -Phadoop2 -Pscala-2.11" SPARKR="true" BUILD_FLAG="package -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.* -DfailIfNoTests=false" + env: PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.1 -Phadoop2 -Pscala-2.11 -Pr" SPARKR="true" BUILD_FLAG="package -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies,r" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.rinterpreter.*,org.apache.spark.api.r.* -DfailIfNoTests=false" # Test spark module for 2.0.2 with scala 2.11 - jdk: "oraclejdk8" dist: trusty - env: PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.0 -Phadoop3 -Pscala-2.11" SPARKR="true" BUILD_FLAG="package -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.* -DfailIfNoTests=false" + env: PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.0 -Phadoop3 -Pscala-2.11 -Pr" SPARKR="true" BUILD_FLAG="package -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies,r" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.rinterpreter.*,org.apache.spark.api.r.* -DfailIfNoTests=false" # Test python/pyspark with python 2, livy 0.5 - sudo: required http://git-wip-us.apache.org/repos/asf/zeppelin/blob/793052ee/r/pom.xml -- diff --git a/r/pom.xml b/r/pom.xml index 1c0c31a..fc9fa66 100644 --- a/r/pom.xml +++ b/r/pom.xml @@ -21,16 +21,19 @@ 4.0.0 -zeppelin +interpreter-parent org.apache.zeppelin 0.8.1-SNAPSHOT -.. +../interpreter-parent - zeppelin-zrinterpreter_2.10 + org.apache.zeppelin + zeppelin-zrinterpreter_${scala.binary.version} jar + 0.8.1-SNAPSHOT Zeppelin: R Interpreter R Interpreter for Zeppelin + http://zeppelin.apache.org .sh @@ -77,7 +80,7 @@ ${project.groupId} - zeppelin-
[zeppelin] Git Push Summary
Repository: zeppelin Updated Tags: refs/tags/v0.8.0-rc1 [deleted] 283b6243e
[2/2] zeppelin git commit: Preparing development version 0.8.1-SNAPSHOT
Preparing development version 0.8.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/3a3475b6 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/3a3475b6 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/3a3475b6 Branch: refs/heads/branch-0.8 Commit: 3a3475b6218819a9767ebc2b388297aa40ebf8c7 Parents: 283b624 Author: Jeff Zhang Authored: Thu Apr 26 19:34:01 2018 +0800 Committer: Jeff Zhang Committed: Thu Apr 26 19:34:01 2018 +0800 -- alluxio/pom.xml | 4 ++-- angular/pom.xml | 4 ++-- beam/pom.xml | 4 ++-- bigquery/pom.xml | 4 ++-- cassandra/pom.xml| 4 ++-- elasticsearch/pom.xml| 4 ++-- file/pom.xml | 4 ++-- flink/pom.xml| 4 ++-- geode/pom.xml| 4 ++-- groovy/pom.xml | 4 ++-- hbase/pom.xml| 4 ++-- helium-dev/pom.xml | 4 ++-- ignite/pom.xml | 4 ++-- interpreter-parent/pom.xml | 4 ++-- jdbc/pom.xml | 4 ++-- kylin/pom.xml| 4 ++-- lens/pom.xml | 4 ++-- livy/pom.xml | 4 ++-- markdown/pom.xml | 4 ++-- neo4j/pom.xml| 4 ++-- pig/pom.xml | 4 ++-- pom.xml | 2 +- python/pom.xml | 4 ++-- r/pom.xml| 2 +- sap/pom.xml | 4 ++-- scalding/pom.xml | 4 ++-- scio/pom.xml | 4 ++-- scripts/docker/zeppelin/bin/Dockerfile | 2 +- shell/pom.xml| 4 ++-- spark/interpreter/pom.xml| 4 ++-- spark/pom.xml| 4 ++-- spark/scala-2.10/pom.xml | 4 ++-- spark/scala-2.11/pom.xml | 4 ++-- spark/spark-dependencies/pom.xml | 4 ++-- spark/spark-scala-parent/pom.xml | 4 ++-- spark/spark-shims/pom.xml| 4 ++-- spark/spark1-shims/pom.xml | 4 ++-- spark/spark2-shims/pom.xml | 4 ++-- zeppelin-display/pom.xml | 4 ++-- zeppelin-distribution/pom.xml| 2 +- zeppelin-examples/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-clock/pom.xml | 4 ++-- .../zeppelin-example-clock/zeppelin-example-clock.json | 2 +- zeppelin-examples/zeppelin-example-horizontalbar/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-echo/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-spell-flowchart/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-markdown/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-spell-translator/pom.xml | 4 ++-- zeppelin-integration/pom.xml | 4 ++-- zeppelin-interpreter/pom.xml | 4 ++-- zeppelin-jupyter/pom.xml | 4 ++-- zeppelin-server/pom.xml | 4 ++-- zeppelin-web/pom.xml | 4 ++-- zeppelin-web/src/app/spell/package.json | 2 +- zeppelin-web/src/app/tabledata/package.json | 2 +- zeppelin-web/src/app/visualization/package.json | 2 +- zeppelin-zengine/pom.xml | 4 ++-- 57 files changed, 106 insertions(+), 106 deletions(-) --
[zeppelin] Git Push Summary
Repository: zeppelin Updated Tags: refs/tags/v0.8.0-rc1 [created] 283b6243e
[1/2] zeppelin git commit: Preparing Apache Zeppelin release 0.8.0
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 cae48c39f -> 3a3475b62 Preparing Apache Zeppelin release 0.8.0 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/283b6243 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/283b6243 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/283b6243 Branch: refs/heads/branch-0.8 Commit: 283b6243e1aa37c2c2a34e157bffceba8c97b9e0 Parents: cae48c3 Author: Jeff Zhang Authored: Thu Apr 26 19:33:56 2018 +0800 Committer: Jeff Zhang Committed: Thu Apr 26 19:33:56 2018 +0800 -- alluxio/pom.xml | 4 ++-- angular/pom.xml | 4 ++-- beam/pom.xml | 4 ++-- bigquery/pom.xml | 4 ++-- cassandra/pom.xml| 4 ++-- docs/_config.yml | 4 ++-- elasticsearch/pom.xml| 4 ++-- file/pom.xml | 4 ++-- flink/pom.xml| 4 ++-- geode/pom.xml| 4 ++-- groovy/pom.xml | 4 ++-- hbase/pom.xml| 4 ++-- helium-dev/pom.xml | 4 ++-- ignite/pom.xml | 4 ++-- interpreter-parent/pom.xml | 4 ++-- jdbc/pom.xml | 4 ++-- kylin/pom.xml| 4 ++-- lens/pom.xml | 4 ++-- livy/pom.xml | 4 ++-- markdown/pom.xml | 4 ++-- neo4j/pom.xml| 4 ++-- pig/pom.xml | 4 ++-- pom.xml | 2 +- python/pom.xml | 4 ++-- r/pom.xml| 2 +- sap/pom.xml | 4 ++-- scalding/pom.xml | 4 ++-- scio/pom.xml | 4 ++-- scripts/docker/zeppelin/bin/Dockerfile | 2 +- shell/pom.xml| 4 ++-- spark/interpreter/pom.xml| 4 ++-- spark/pom.xml| 4 ++-- spark/scala-2.10/pom.xml | 4 ++-- spark/scala-2.11/pom.xml | 4 ++-- spark/spark-dependencies/pom.xml | 4 ++-- spark/spark-scala-parent/pom.xml | 4 ++-- spark/spark-shims/pom.xml| 4 ++-- spark/spark1-shims/pom.xml | 4 ++-- spark/spark2-shims/pom.xml | 4 ++-- zeppelin-display/pom.xml | 4 ++-- zeppelin-distribution/pom.xml| 2 +- zeppelin-examples/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-clock/pom.xml | 4 ++-- .../zeppelin-example-clock/zeppelin-example-clock.json | 2 +- zeppelin-examples/zeppelin-example-horizontalbar/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-echo/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-spell-flowchart/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-markdown/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-spell-translator/pom.xml | 4 ++-- zeppelin-integration/pom.xml | 4 ++-- zeppelin-interpreter/pom.xml | 4 ++-- zeppelin-jupyter/pom.xml | 4 ++-- zeppelin-server/pom.xml | 4 ++-- zeppelin-web/pom.xml | 4 ++-- zeppelin-web/src/app/spell/package.json | 2 +- zeppelin-web/src/app/tabledata/package.json | 2 +- zeppelin-web/src/app/visualization/package.json | 2 +- zeppelin-zengine/pom.xml
zeppelin git commit: [HOTFIX] correct the path for interpreter installation doc
Repository: zeppelin Updated Branches: refs/heads/master 3fb878bfa -> 9e18159d4 [HOTFIX] correct the path for interpreter installation doc ### What is this PR for? Trivial fix for release ### What type of PR is it? [Hot Fix] ### Todos * [ ] - Task ### What is the Jira issue? * No jira created ### How should this be tested? * CI pass ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang Closes #2948 from zjffdu/release_hotfix and squashes the following commits: 9b781e1 [Jeff Zhang] [HOTFIX] correct the path for interpreter installation doc Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9e18159d Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9e18159d Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9e18159d Branch: refs/heads/master Commit: 9e18159d440cc771a13b81b56dcd62c72202bd0b Parents: 3fb878b Author: Jeff Zhang Authored: Thu Apr 26 19:25:46 2018 +0800 Committer: Jeff Zhang Committed: Thu Apr 26 19:31:37 2018 +0800 -- dev/change_zeppelin_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9e18159d/dev/change_zeppelin_version.sh -- diff --git a/dev/change_zeppelin_version.sh b/dev/change_zeppelin_version.sh index 7646e9d..c4ef7e6 100755 --- a/dev/change_zeppelin_version.sh +++ b/dev/change_zeppelin_version.sh @@ -76,5 +76,5 @@ if is_dev_version "${FROM_VERSION}" || ! is_dev_version "${TO_VERSION}"; then # Change interpreter's maven version in docs and interpreter-list sed -i '' 's/:'"${FROM_VERSION}"'/:'"${TO_VERSION}"'/g' conf/interpreter-list - sed -i '' 's/:'"${FROM_VERSION}"'/:'"${TO_VERSION}"'/g' docs/manual/interpreterinstallation.md + sed -i '' 's/:'"${FROM_VERSION}"'/:'"${TO_VERSION}"'/g' docs/usage/interpreter/installation.md fi
zeppelin git commit: [HOTFIX] correct the path for interpreter installation doc
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 3d1cb860b -> cae48c39f [HOTFIX] correct the path for interpreter installation doc ### What is this PR for? Trivial fix for release ### What type of PR is it? [Hot Fix] ### Todos * [ ] - Task ### What is the Jira issue? * No jira created ### How should this be tested? * CI pass ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang Closes #2948 from zjffdu/release_hotfix and squashes the following commits: 9b781e1 [Jeff Zhang] [HOTFIX] correct the path for interpreter installation doc (cherry picked from commit 9e18159d440cc771a13b81b56dcd62c72202bd0b) Signed-off-by: Jeff Zhang Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/cae48c39 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/cae48c39 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/cae48c39 Branch: refs/heads/branch-0.8 Commit: cae48c39f2c5f8070853e81a0b57cba776fc58b4 Parents: 3d1cb86 Author: Jeff Zhang Authored: Thu Apr 26 19:25:46 2018 +0800 Committer: Jeff Zhang Committed: Thu Apr 26 19:31:48 2018 +0800 -- dev/change_zeppelin_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/cae48c39/dev/change_zeppelin_version.sh -- diff --git a/dev/change_zeppelin_version.sh b/dev/change_zeppelin_version.sh index cb9c017..faccb62 100755 --- a/dev/change_zeppelin_version.sh +++ b/dev/change_zeppelin_version.sh @@ -76,5 +76,5 @@ if is_dev_version "${FROM_VERSION}" || ! is_dev_version "${TO_VERSION}"; then # Change interpreter's maven version in docs and interpreter-list sed -i '' 's/:'"${FROM_VERSION}"'/:'"${TO_VERSION}"'/g' conf/interpreter-list - sed -i '' 's/:'"${FROM_VERSION}"'/:'"${TO_VERSION}"'/g' docs/manual/interpreterinstallation.md + sed -i '' 's/:'"${FROM_VERSION}"'/:'"${TO_VERSION}"'/g' docs/usage/interpreter/installation.md fi
zeppelin git commit: [HOTFIX] Code style fix for branch-0.8
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 6ce81b54f -> 3d1cb860b [HOTFIX] Code style fix for branch-0.8 ### What is this PR for? Trivial code style fix for branch-0.8 ### What type of PR is it? [Hot Fix] ### Todos * [ ] - Task ### What is the Jira issue? * No jira created ### How should this be tested? * CI pass ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang Closes #2946 from zjffdu/codestyle and squashes the following commits: 417fa7a [Jeff Zhang] [HOTFIX] Code style issue fix for branch-0.8 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/3d1cb860 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/3d1cb860 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/3d1cb860 Branch: refs/heads/branch-0.8 Commit: 3d1cb860b99f6caefbfd0b666b9d31a5b0d3536c Parents: 6ce81b5 Author: Jeff Zhang Authored: Thu Apr 26 16:14:45 2018 +0800 Committer: Jeff Zhang Committed: Thu Apr 26 17:54:18 2018 +0800 -- .../interpreter/InterpreterSettingManager.java | 70 ++-- 1 file changed, 35 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3d1cb860/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java -- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java index b61ec55..c09cf4a 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java @@ -434,17 +434,17 @@ public class InterpreterSettingManager { public List getInterpreterSettings(String noteId) { List settings = new ArrayList<>(); - List interpreterSettingIds = interpreterBindings.get(noteId); - if (interpreterSettingIds != null) { -for (String settingId : interpreterSettingIds) { - if (interpreterSettings.containsKey(settingId)) { -settings.add(interpreterSettings.get(settingId)); - } else { -LOGGER.warn("InterpreterSetting {} has been removed, but note {} still bind to it.", -settingId, noteId); - } +List interpreterSettingIds = interpreterBindings.get(noteId); +if (interpreterSettingIds != null) { + for (String settingId : interpreterSettingIds) { +if (interpreterSettings.containsKey(settingId)) { + settings.add(interpreterSettings.get(settingId)); +} else { + LOGGER.warn("InterpreterSetting {} has been removed, but note {} still bind to it.", + settingId, noteId); } } +} return settings; } @@ -616,36 +616,36 @@ public class InterpreterSettingManager { */ private void copyDependenciesFromLocalPath(final InterpreterSetting setting) { setting.setStatus(InterpreterSetting.Status.DOWNLOADING_DEPENDENCIES); - final Thread t = new Thread() { -public void run() { - try { -List deps = setting.getDependencies(); -if (deps != null) { - for (Dependency d : deps) { -File destDir = new File( -conf.getRelativeDir(ConfVars.ZEPPELIN_DEP_LOCALREPO)); - -int numSplits = d.getGroupArtifactVersion().split(":").length; -if (!(numSplits >= 3 && numSplits <= 6)) { - dependencyResolver.copyLocalDependency(d.getGroupArtifactVersion(), - new File(destDir, setting.getId())); -} +final Thread t = new Thread() { + public void run() { +try { + List deps = setting.getDependencies(); + if (deps != null) { +for (Dependency d : deps) { + File destDir = new File( + conf.getRelativeDir(ConfVars.ZEPPELIN_DEP_LOCALREPO)); + + int numSplits = d.getGroupArtifactVersion().split(":").length; + if (!(numSplits >= 3 && numSplits <= 6)) { + dependencyResolver.copyLocalDependency(d.getGroupArtifactVersion(), +new File(destDir, setting.getId())); } } -setting.setStatus(InterpreterSetting.Status.READY); - } catch (Exception e) { -LOGGER.error(String.format("Error while copying deps for interpreter group : %s," + -" go to interpreter setting page click on edit and save
zeppelin git commit: ZEPPELIN-3401. Deadlock while restarting interpreter
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 eb7969b0c -> 6ce81b54f ZEPPELIN-3401. Deadlock while restarting interpreter ### What is this PR for? I suspect it is due to deadlock issue between LifecycleThread & CronJobThread: Thread | Locked | Waiting -- | -- | -- LifecycleThread | InterpreterGroup | Note CronJobThread | Note | Wait for Paragraph to finish (Paragraph can not finish because it needs the lock of InterpreterGroup This PR wold eliminate the necessary to lock on Note for LifecycleThread ### What type of PR is it? [Bug Fix ] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-3401 ### How should this be tested? * First time? Setup Travis CI as described on https://zeppelin.apache.org/contribution/contributions.html#continuous-integration * Strongly recommended: add automated unit tests for any new or changed behavior * Outline any manual steps to test the PR here. ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang Closes #2937 from zjffdu/ZEPPELIN-3401 and squashes the following commits: 5ffcc11 [Jeff Zhang] ZEPPELIN-3401. Deadlock while restarting interpreter (cherry picked from commit 3fb878bfaa59c33182ebc80fb48aabb73e06d0d1) Signed-off-by: Jeff Zhang Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/6ce81b54 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/6ce81b54 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/6ce81b54 Branch: refs/heads/branch-0.8 Commit: 6ce81b54f4f0736070cff8da58368a45dd611ae4 Parents: eb7969b Author: Jeff Zhang Authored: Sun Apr 22 11:46:53 2018 +0800 Committer: Jeff Zhang Committed: Thu Apr 26 16:09:15 2018 +0800 -- .../src/main/java/org/apache/zeppelin/notebook/Note.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6ce81b54/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java -- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java index 4740abb..7a7b992 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java @@ -103,6 +103,7 @@ public class Note implements ParagraphJobListener, JsonSerializable { private transient NotebookRepo repo; private transient SearchService index; private transient ScheduledFuture delayedPersist; + private transient Object delayedPersistLock = new Object(); private transient NoteEventListener noteEventListener; private transient Credentials credentials; private transient NoteNameListener noteNameListener; @@ -856,7 +857,7 @@ public class Note implements ParagraphJobListener, JsonSerializable { } private void startDelayedPersistTimer(int maxDelaySec, final AuthenticationInfo subject) { -synchronized (this) { +synchronized (delayedPersistLock) { if (delayedPersist != null) { return; } @@ -876,11 +877,10 @@ public class Note implements ParagraphJobListener, JsonSerializable { } private void stopDelayedPersistTimer() { -synchronized (this) { +synchronized (delayedPersistLock) { if (delayedPersist == null) { return; } - delayedPersist.cancel(false); } }
zeppelin git commit: ZEPPELIN-3401. Deadlock while restarting interpreter
Repository: zeppelin Updated Branches: refs/heads/master 1cea92ca3 -> 3fb878bfa ZEPPELIN-3401. Deadlock while restarting interpreter ### What is this PR for? I suspect it is due to deadlock issue between LifecycleThread & CronJobThread: Thread | Locked | Waiting -- | -- | -- LifecycleThread | InterpreterGroup | Note CronJobThread | Note | Wait for Paragraph to finish (Paragraph can not finish because it needs the lock of InterpreterGroup This PR wold eliminate the necessary to lock on Note for LifecycleThread ### What type of PR is it? [Bug Fix ] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-3401 ### How should this be tested? * First time? Setup Travis CI as described on https://zeppelin.apache.org/contribution/contributions.html#continuous-integration * Strongly recommended: add automated unit tests for any new or changed behavior * Outline any manual steps to test the PR here. ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang Closes #2937 from zjffdu/ZEPPELIN-3401 and squashes the following commits: 5ffcc11 [Jeff Zhang] ZEPPELIN-3401. Deadlock while restarting interpreter Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/3fb878bf Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/3fb878bf Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/3fb878bf Branch: refs/heads/master Commit: 3fb878bfaa59c33182ebc80fb48aabb73e06d0d1 Parents: 1cea92c Author: Jeff Zhang Authored: Sun Apr 22 11:46:53 2018 +0800 Committer: Jeff Zhang Committed: Thu Apr 26 16:06:54 2018 +0800 -- .../src/main/java/org/apache/zeppelin/notebook/Note.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3fb878bf/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java -- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java index 80c96e2..3dc2b99 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java @@ -103,6 +103,7 @@ public class Note implements ParagraphJobListener, JsonSerializable { private transient NotebookRepo repo; private transient SearchService index; private transient ScheduledFuture delayedPersist; + private transient Object delayedPersistLock = new Object(); private transient NoteEventListener noteEventListener; private transient Credentials credentials; private transient NoteNameListener noteNameListener; @@ -861,7 +862,7 @@ public class Note implements ParagraphJobListener, JsonSerializable { } private void startDelayedPersistTimer(int maxDelaySec, final AuthenticationInfo subject) { -synchronized (this) { +synchronized (delayedPersistLock) { if (delayedPersist != null) { return; } @@ -881,11 +882,10 @@ public class Note implements ParagraphJobListener, JsonSerializable { } private void stopDelayedPersistTimer() { -synchronized (this) { +synchronized (delayedPersistLock) { if (delayedPersist == null) { return; } - delayedPersist.cancel(false); } }
zeppelin git commit: ZEPPELIN-3404. Fail to run cronjob when user doesn't run it manually before cronjob
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 4456b270b -> eb7969b0c ZEPPELIN-3404. Fail to run cronjob when user doesn't run it manually before cronjob ### What is this PR for? This bug is introduced by #2914, this PR will set authenticationInfo using its user as we will store user into note.json. ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-3404 ### How should this be tested? * Manually tested ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang Closes #2925 from zjffdu/ZEPPELIN-3404 and squashes the following commits: b94ecc9 [Jeff Zhang] ZEPPELIN-3404. Fail to run cronjob when user doesn't run it manually before cronjob (cherry picked from commit 1cea92ca30285241239538f358e90dea014b2e5f) Signed-off-by: Jeff Zhang Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/eb7969b0 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/eb7969b0 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/eb7969b0 Branch: refs/heads/branch-0.8 Commit: eb7969b0c60bc82658e3033ba7a40741b7204fce Parents: 4456b27 Author: Jeff Zhang Authored: Fri Apr 13 10:31:45 2018 +0800 Committer: Jeff Zhang Committed: Thu Apr 26 16:06:02 2018 +0800 -- .../apache/zeppelin/user/AuthenticationInfo.java | 4 .../src/app/notebook/notebook.controller.js| 10 -- .../java/org/apache/zeppelin/notebook/Note.java| 17 + 3 files changed, 21 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/eb7969b0/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java -- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java index c9412cb..455fd8b 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java @@ -76,6 +76,10 @@ public class AuthenticationInfo implements JsonSerializable { this.roles = roles; } + public void setRoles(String roles) { +this.roles = gson.fromJson(roles, ArrayList.class); + } + public List getUsersAndRoles() { List usersAndRoles = new ArrayList<>(); if (roles != null) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/eb7969b0/zeppelin-web/src/app/notebook/notebook.controller.js -- diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js index ba88e3f..448df6e 100644 --- a/zeppelin-web/src/app/notebook/notebook.controller.js +++ b/zeppelin-web/src/app/notebook/notebook.controller.js @@ -447,19 +447,17 @@ function NotebookCtrl($scope, $route, $routeParams, $location, $rootScope, if (!$scope.note.config.cronExecutingUser) { $scope.note.config.cronExecutingUser = $rootScope.ticket.principal; } + if (!$scope.note.config.cronExecutingRoles) { +$scope.note.config.cronExecutingRoles = $rootScope.ticket.roles; + } } else { $scope.note.config.cronExecutingUser = ''; + $scope.note.config.cronExecutingRoles = ''; } $scope.note.config.cron = cronExpr; $scope.setConfig(); }; - /** Set the username of the user to be used to execute all notes in notebook **/ - $scope.setCronExecutingUser = function(cronExecutingUser) { -$scope.note.config.cronExecutingUser = cronExecutingUser; -$scope.setConfig(); - }; - /** Set release resource for this note **/ $scope.setReleaseResource = function(value) { $scope.note.config.releaseresource = value; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/eb7969b0/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java -- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java index 3c49eac..4740abb 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java @@ -21,6 +21,7 @@ import static java.lang.String.format; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import com.google.gson.Gson; import co
zeppelin git commit: ZEPPELIN-3404. Fail to run cronjob when user doesn't run it manually before cronjob
Repository: zeppelin Updated Branches: refs/heads/master c31f3b60a -> 1cea92ca3 ZEPPELIN-3404. Fail to run cronjob when user doesn't run it manually before cronjob ### What is this PR for? This bug is introduced by #2914, this PR will set authenticationInfo using its user as we will store user into note.json. ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-3404 ### How should this be tested? * Manually tested ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang Closes #2925 from zjffdu/ZEPPELIN-3404 and squashes the following commits: b94ecc9 [Jeff Zhang] ZEPPELIN-3404. Fail to run cronjob when user doesn't run it manually before cronjob Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/1cea92ca Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/1cea92ca Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/1cea92ca Branch: refs/heads/master Commit: 1cea92ca30285241239538f358e90dea014b2e5f Parents: c31f3b6 Author: Jeff Zhang Authored: Fri Apr 13 10:31:45 2018 +0800 Committer: Jeff Zhang Committed: Thu Apr 26 16:05:48 2018 +0800 -- .../apache/zeppelin/user/AuthenticationInfo.java | 4 .../src/app/notebook/notebook.controller.js| 10 -- .../java/org/apache/zeppelin/notebook/Note.java| 17 + 3 files changed, 21 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1cea92ca/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java -- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java index c9412cb..455fd8b 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java @@ -76,6 +76,10 @@ public class AuthenticationInfo implements JsonSerializable { this.roles = roles; } + public void setRoles(String roles) { +this.roles = gson.fromJson(roles, ArrayList.class); + } + public List getUsersAndRoles() { List usersAndRoles = new ArrayList<>(); if (roles != null) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1cea92ca/zeppelin-web/src/app/notebook/notebook.controller.js -- diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js index ba88e3f..448df6e 100644 --- a/zeppelin-web/src/app/notebook/notebook.controller.js +++ b/zeppelin-web/src/app/notebook/notebook.controller.js @@ -447,19 +447,17 @@ function NotebookCtrl($scope, $route, $routeParams, $location, $rootScope, if (!$scope.note.config.cronExecutingUser) { $scope.note.config.cronExecutingUser = $rootScope.ticket.principal; } + if (!$scope.note.config.cronExecutingRoles) { +$scope.note.config.cronExecutingRoles = $rootScope.ticket.roles; + } } else { $scope.note.config.cronExecutingUser = ''; + $scope.note.config.cronExecutingRoles = ''; } $scope.note.config.cron = cronExpr; $scope.setConfig(); }; - /** Set the username of the user to be used to execute all notes in notebook **/ - $scope.setCronExecutingUser = function(cronExecutingUser) { -$scope.note.config.cronExecutingUser = cronExecutingUser; -$scope.setConfig(); - }; - /** Set release resource for this note **/ $scope.setReleaseResource = function(value) { $scope.note.config.releaseresource = value; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1cea92ca/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java -- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java index 664e986..80c96e2 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java @@ -21,6 +21,7 @@ import static java.lang.String.format; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import java.io.IOException; @@ -31,6 +32,7 @@ import java.util.LinkedHashMap;
zeppelin git commit: [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 e5a080e6d -> 4456b270b [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md ### What is this PR for? Python dynamic forms document URL is based on "0.6.0-SNAPSHOT" and already deprecated. Replace the deprecated URL with the latest URL. ### What type of PR is it? Documentation ### Todos N/A ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-3423 ### How should this be tested? N/A ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Changhyup Jwa Closes #2939 from jwagun/ZEPPELIN-3423 and squashes the following commits: 360261c2f [Changhyup Jwa] [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md Change-Id: I540a222678a82d6f88d91bf8790acf4fca19d992 (cherry picked from commit c31f3b60a98ade035825e6efd8de071555b5624a) Signed-off-by: Renjith Kamath Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/4456b270 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/4456b270 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/4456b270 Branch: refs/heads/branch-0.8 Commit: 4456b270bd30a79fa17b8c655b12d86c80726271 Parents: e5a080e Author: Changhyup Jwa Authored: Mon Apr 23 18:05:07 2018 +0900 Committer: Renjith Kamath Committed: Thu Apr 26 12:37:08 2018 +0530 -- python/README.md | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4456b270/python/README.md -- diff --git a/python/README.md b/python/README.md index 7a20e8d..1b9e91b 100644 --- a/python/README.md +++ b/python/README.md @@ -17,12 +17,7 @@ mvn -Dpython.test.exclude='' test -pl python -am - **Py4j support** [Py4j](https://www.py4j.org/) enables Python programs to dynamically access Java objects in a JVM. - It is required in order to use Zeppelin [dynamic forms](http://zeppelin.apache.org/docs/0.6.0-SNAPSHOT/manual/dynamicform.html) feature. - - - bootstrap process - - Interpreter environment is setup with thex [bootstrap.py](https://github.com/apache/zeppelin/blob/master/python/src/main/resources/bootstrap.py) - It defines `help()` and `z` convenience functions + It is required in order to use Zeppelin [dynamic forms](https://zeppelin.apache.org/docs/latest/manual/dynamicform.html) feature. ### Dev prerequisites
zeppelin git commit: [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md
Repository: zeppelin Updated Branches: refs/heads/master 806831454 -> c31f3b60a [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md ### What is this PR for? Python dynamic forms document URL is based on "0.6.0-SNAPSHOT" and already deprecated. Replace the deprecated URL with the latest URL. ### What type of PR is it? Documentation ### Todos N/A ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-3423 ### How should this be tested? N/A ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Changhyup Jwa Closes #2939 from jwagun/ZEPPELIN-3423 and squashes the following commits: 360261c2f [Changhyup Jwa] [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md Change-Id: I540a222678a82d6f88d91bf8790acf4fca19d992 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c31f3b60 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c31f3b60 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c31f3b60 Branch: refs/heads/master Commit: c31f3b60a98ade035825e6efd8de071555b5624a Parents: 8068314 Author: Changhyup Jwa Authored: Mon Apr 23 18:05:07 2018 +0900 Committer: Renjith Kamath Committed: Thu Apr 26 12:36:38 2018 +0530 -- python/README.md | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c31f3b60/python/README.md -- diff --git a/python/README.md b/python/README.md index 7a20e8d..1b9e91b 100644 --- a/python/README.md +++ b/python/README.md @@ -17,12 +17,7 @@ mvn -Dpython.test.exclude='' test -pl python -am - **Py4j support** [Py4j](https://www.py4j.org/) enables Python programs to dynamically access Java objects in a JVM. - It is required in order to use Zeppelin [dynamic forms](http://zeppelin.apache.org/docs/0.6.0-SNAPSHOT/manual/dynamicform.html) feature. - - - bootstrap process - - Interpreter environment is setup with thex [bootstrap.py](https://github.com/apache/zeppelin/blob/master/python/src/main/resources/bootstrap.py) - It defines `help()` and `z` convenience functions + It is required in order to use Zeppelin [dynamic forms](https://zeppelin.apache.org/docs/latest/manual/dynamicform.html) feature. ### Dev prerequisites