[zeppelin] Git Push Summary
Repository: zeppelin Updated Tags: refs/tags/v0.8.0-rc5 [created] 029ad9615
[1/2] zeppelin git commit: Preparing Apache Zeppelin release 0.8.0
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 14acea1ee -> 731d0be6b 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/029ad961 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/029ad961 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/029ad961 Branch: refs/heads/branch-0.8 Commit: 029ad96157b2f236c917d4b68b20b434418d5809 Parents: 14acea1 Author: Jeff Zhang Authored: Thu Jun 14 11:47:36 2018 +0800 Committer: Jeff Zhang Committed: Thu Jun 14 11:47:36 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/029ad961/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
[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/731d0be6 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/731d0be6 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/731d0be6 Branch: refs/heads/branch-0.8 Commit: 731d0be6bfecb8966dff6bbf99fc8f9205ce71e0 Parents: 029ad96 Author: Jeff Zhang Authored: Thu Jun 14 11:47:41 2018 +0800 Committer: Jeff Zhang Committed: Thu Jun 14 11:47:41 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/731d0be6/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/731d0be6
zeppelin git commit: [SECURITY] Upgrade py4j to 0.10.7
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 7b0c21626 -> 14acea1ee [SECURITY] Upgrade py4j to 0.10.7 (cherry picked from commit 9f38340a63b055066026a85e17c1d7a14fd526c3) Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/14acea1e Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/14acea1e Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/14acea1e Branch: refs/heads/branch-0.8 Commit: 14acea1ee180d970d77a53c4884a309c77c7499f Parents: 7b0c216 Author: Jeff Zhang Authored: Mon Jun 11 09:44:08 2018 +0800 Committer: Jeff Zhang Committed: Thu Jun 14 11:46:21 2018 +0800 -- python/pom.xml | 32 --- .../zeppelin/python/IPythonInterpreter.java | 15 +++- .../org/apache/zeppelin/python/Py4JUtils.java | 91 .../resources/grpc/python/zeppelin_python.py| 13 ++- spark/interpreter/pom.xml | 4 - .../zeppelin/spark/IPySparkInterpreter.java | 2 + .../org/apache/zeppelin/spark/Py4JUtils.java| 90 +++ .../zeppelin/spark/PySparkInterpreter.java | 11 ++- .../zeppelin/spark/SparkRInterpreter.java | 3 +- .../main/resources/python/zeppelin_ipyspark.py | 14 ++- .../main/resources/python/zeppelin_pyspark.py | 15 +++- .../spark/BaseSparkScalaInterpreter.scala | 3 - .../interpreter/SparkIntegrationTest.java | 5 +- 13 files changed, 239 insertions(+), 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/14acea1e/python/pom.xml -- diff --git a/python/pom.xml b/python/pom.xml index 03da41c..468a7bc 100644 --- a/python/pom.xml +++ b/python/pom.xml @@ -198,38 +198,6 @@ -org.apache.maven.plugins -maven-shade-plugin -${plugin.shade.version} - - - - - reference.conf - - - - - com.google.common - org.apache.zeppelin.com.google.common - - - py4j - org.apache.zeppelin.py4j - - - - - -package - - shade - - - - - - maven-enforcer-plugin http://git-wip-us.apache.org/repos/asf/zeppelin/blob/14acea1e/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java -- diff --git a/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java b/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java index 5c5bfe3..b873f7e 100644 --- a/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java +++ b/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java @@ -84,6 +84,8 @@ public class IPythonInterpreter extends Interpreter implements ExecuteResultHand private String additionalPythonPath; private String additionalPythonInitFile; private boolean useBuiltinPy4j = true; + private boolean useAuth = false; + private String secret; private InterpreterOutputStream interpreterOutput = new InterpreterOutputStream(LOGGER); @@ -147,8 +149,10 @@ public class IPythonInterpreter extends Interpreter implements ExecuteResultHand 32 * 1024 * 1024 + "")); ipythonClient = new IPythonClient(ManagedChannelBuilder.forAddress("127.0.0.1", ipythonPort) .usePlaintext(true).maxInboundMessageSize(message_size)); + this.useAuth = Boolean.parseBoolean(getProperty("zeppelin.py4j.useAuth", "false")); + this.secret = Py4JUtils.createSecret(256); launchIPythonKernel(ipythonPort); - setupJVMGateway(jvmGatewayPort); + setupJVMGateway(jvmGatewayPort, secret, useAuth); } catch (Exception e) { throw new RuntimeException("Fail to open IPythonInterpreter", e); } @@ -196,8 +200,10 @@ public class IPythonInterpreter extends Interpreter implements ExecuteResultHand return ""; } - private void setupJVMGateway(int jvmGatewayPort) throws IOException { -gatewayServer = new GatewayServer(this, jvmGatewayPort); + private void setupJVMGateway(int jvmGatewayPort, String secret, boolean useAuth) + throws IOException { +gatewayServer = +Py4JUtils.createGatewayServer(this, "127.0.0.1", jvmGatewayPort, secret, useAuth); gatewayServer.start(); InputStream input = @@ -303,6 +309,9 @@ public class IPythonInterpreter extends Interpreter implements ExecuteResultHand } else { envs.put("PYTHONPATH", additionalPythonPath); } +if (useAuth) { + envs.put("PY4J_GATEWAY_SE
zeppelin git commit: [ZEPPELIN-3522] String "defaultValue" instead of boolean in some "interpreter-settings.json" files
Repository: zeppelin Updated Branches: refs/heads/master a19ec6711 -> d88a002d1 [ZEPPELIN-3522] String "defaultValue" instead of boolean in some "interpreter-settings.json" files ### What is this PR for? The _interpreter-settings.json_ file for each interpreter has details of each configurable parameter for that interpreter. Each parameter also has a _defaultValue_ setting. For boolean-typed parameters the _defaultValue_ must be set to _true_ or _false_. But in some _interpreter-settings.json_ files, the _defaultValue_ has been set to the string values _"true"_ or _"false"_ (the quote marks are included in the value provided). ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-3522 ### 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: Sanjay Dasgupta Closes #2998 from sanjaydasgupta/zepp-3522-string-default-value and squashes the following commits: 9bdb0f35b [Sanjay Dasgupta] zepp-3522-string-default-value: Initial updates Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/d88a002d Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/d88a002d Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/d88a002d Branch: refs/heads/master Commit: d88a002d101ebcc407f10ac8fa345f8b5ac1f556 Parents: a19ec67 Author: Sanjay Dasgupta Authored: Fri Jun 1 18:51:46 2018 +0530 Committer: Jeff Zhang Committed: Thu Jun 14 11:11:57 2018 +0800 -- cassandra/src/main/resources/interpreter-setting.json | 2 +- livy/src/main/resources/interpreter-setting.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d88a002d/cassandra/src/main/resources/interpreter-setting.json -- diff --git a/cassandra/src/main/resources/interpreter-setting.json b/cassandra/src/main/resources/interpreter-setting.json index 407de9c..0f0d58c 100644 --- a/cassandra/src/main/resources/interpreter-setting.json +++ b/cassandra/src/main/resources/interpreter-setting.json @@ -224,7 +224,7 @@ "cassandra.ssl.enabled": { "envName": null, "propertyName": "cassandra.ssl.enabled", -"defaultValue": "false", +"defaultValue": false, "description": "Cassandra SSL", "type": "checkbox" }, http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d88a002d/livy/src/main/resources/interpreter-setting.json -- diff --git a/livy/src/main/resources/interpreter-setting.json b/livy/src/main/resources/interpreter-setting.json index a7ce2b3..7aa61d6 100644 --- a/livy/src/main/resources/interpreter-setting.json +++ b/livy/src/main/resources/interpreter-setting.json @@ -111,13 +111,13 @@ }, "zeppelin.livy.displayAppInfo": { "propertyName": "zeppelin.livy.displayAppInfo", -"defaultValue": "true", +"defaultValue": true, "description": "Whether display app info", "type": "checkbox" }, "zeppelin.livy.restart_dead_session": { "propertyName": "zeppelin.livy.restart_dead_session", -"defaultValue": "false", +"defaultValue": false, "description": "Whether restart a dead session", "type": "checkbox" }
zeppelin git commit: [ZEPPELIN-3522] String "defaultValue" instead of boolean in some "interpreter-settings.json" files
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 9631a7d9a -> 7b0c21626 [ZEPPELIN-3522] String "defaultValue" instead of boolean in some "interpreter-settings.json" files ### What is this PR for? The _interpreter-settings.json_ file for each interpreter has details of each configurable parameter for that interpreter. Each parameter also has a _defaultValue_ setting. For boolean-typed parameters the _defaultValue_ must be set to _true_ or _false_. But in some _interpreter-settings.json_ files, the _defaultValue_ has been set to the string values _"true"_ or _"false"_ (the quote marks are included in the value provided). ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-3522 ### 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: Sanjay Dasgupta Closes #2998 from sanjaydasgupta/zepp-3522-string-default-value and squashes the following commits: 9bdb0f35b [Sanjay Dasgupta] zepp-3522-string-default-value: Initial updates (cherry picked from commit d88a002d101ebcc407f10ac8fa345f8b5ac1f556) 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/7b0c2162 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7b0c2162 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7b0c2162 Branch: refs/heads/branch-0.8 Commit: 7b0c216262104488e882c74e55ffa0bdbc877915 Parents: 9631a7d Author: Sanjay Dasgupta Authored: Fri Jun 1 18:51:46 2018 +0530 Committer: Jeff Zhang Committed: Thu Jun 14 11:12:09 2018 +0800 -- cassandra/src/main/resources/interpreter-setting.json | 2 +- livy/src/main/resources/interpreter-setting.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7b0c2162/cassandra/src/main/resources/interpreter-setting.json -- diff --git a/cassandra/src/main/resources/interpreter-setting.json b/cassandra/src/main/resources/interpreter-setting.json index 407de9c..0f0d58c 100644 --- a/cassandra/src/main/resources/interpreter-setting.json +++ b/cassandra/src/main/resources/interpreter-setting.json @@ -224,7 +224,7 @@ "cassandra.ssl.enabled": { "envName": null, "propertyName": "cassandra.ssl.enabled", -"defaultValue": "false", +"defaultValue": false, "description": "Cassandra SSL", "type": "checkbox" }, http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7b0c2162/livy/src/main/resources/interpreter-setting.json -- diff --git a/livy/src/main/resources/interpreter-setting.json b/livy/src/main/resources/interpreter-setting.json index a7ce2b3..7aa61d6 100644 --- a/livy/src/main/resources/interpreter-setting.json +++ b/livy/src/main/resources/interpreter-setting.json @@ -111,13 +111,13 @@ }, "zeppelin.livy.displayAppInfo": { "propertyName": "zeppelin.livy.displayAppInfo", -"defaultValue": "true", +"defaultValue": true, "description": "Whether display app info", "type": "checkbox" }, "zeppelin.livy.restart_dead_session": { "propertyName": "zeppelin.livy.restart_dead_session", -"defaultValue": "false", +"defaultValue": false, "description": "Whether restart a dead session", "type": "checkbox" }
zeppelin git commit: [ZEPPELIN-3528] Ordering by interpreter name in same interpreter group
Repository: zeppelin Updated Branches: refs/heads/master b7c3fec95 -> a19ec6711 [ZEPPELIN-3528] Ordering by interpreter name in same interpreter group ### What is this PR for? In 'Create new note' diagram, 'Default Interpreter' is ordered by only interpreter groups. But interpreter is not ordered in same interpreter group. (It seems to be ordered by hashcode of 'InterpreterSetting') When there are many interpreter in same group and this group is first, user cannot predict what interpreter is showed first. So I think that interpreter need to be ordered by name. ### What type of PR is it? [Improvement] ### Todos * [x] - Modify Code ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-3528 ### How should this be tested? * Click 'create new note' ### 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: Jaehoon Jeong Closes #3005 from woowahan-jaehoon/ZEPPELIN-3528 and squashes the following commits: 5cb709ce3 [Jaehoon Jeong] [ZEPPELIN-3528] Ordering by interpreter name in same interpreter group Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a19ec671 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a19ec671 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a19ec671 Branch: refs/heads/master Commit: a19ec671123283c1ec3c49b2514e9d0777da4889 Parents: b7c3fec Author: Jaehoon Jeong Authored: Tue Jun 5 20:39:55 2018 +0900 Committer: Jeff Zhang Committed: Thu Jun 14 11:10:03 2018 +0800 -- .../org/apache/zeppelin/interpreter/InterpreterSettingManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a19ec671/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 d595a5d..4d86588 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 @@ -917,7 +917,7 @@ public class InterpreterSettingManager implements InterpreterSettingManagerMBean } else if (i > j) { return 1; } else { - return 0; + return o1.getName().compareTo(o2.getName()); } } });
zeppelin git commit: [ZEPPELIN-3285] Refine the style of Notebook title
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 b7dfa330e -> 9631a7d9a [ZEPPELIN-3285] Refine the style of Notebook title Refine the style of Notebook title (Ellipsis by character, 100% width under medium width browser, align delete button) (Before) ![before](https://user-images.githubusercontent.com/3839771/40781776-1c420044-6518-11e8-94d6-fc7d5103771b.gif) (After) ![after](https://user-images.githubusercontent.com/3839771/40781830-5bd25dee-6518-11e8-871f-23bbf31507e5.gif) Improvement https://issues.apache.org/jira/browse/ZEPPELIN-3285 **1. Run webapp** ```vi cd zeppelin-web yarn run dev ``` **2. Check the title have ellipsis by character, not looks cut.** ![image](https://user-images.githubusercontent.com/3839771/40782010-f1771e98-6518-11e8-9373-00fbeed75f2d.png) (before / after) **3. Check 'delete button' is aligned** ![image](https://user-images.githubusercontent.com/3839771/40782056-166634aa-6519-11e8-8cbe-8aa7f33f665b.png) ![image](https://user-images.githubusercontent.com/3839771/40782062-1b548f52-6519-11e8-985f-6e79084ce927.png) (before / after) **4. Check the title with is 100% under the window width 650px** ![image](https://user-images.githubusercontent.com/3839771/40782107-40b122e2-6519-11e8-9c01-887df47e7f26.png) (before / after) * 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. * Does the licenses files need update? N * Is there breaking changes for older versions? N * Does this needs documentation? N Author: Jay Jin Closes #2994 from milooy/master and squashes the following commits: 6049ee118 [Jay Jin] ZEPPELIN-3285 Delete left margin of title, ellipsis by word, RWD dba654884 [Jay Jin] ZEPPELIN-3285 Align delete button in action bar Change-Id: I09a2ac9afc4eb2f126f6fcc9a11bb0f972561b69 (cherry picked from commit b7c3fec95daacef66089468ca86832602275a716) 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/9631a7d9 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9631a7d9 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9631a7d9 Branch: refs/heads/branch-0.8 Commit: 9631a7d9ac2221b9a62e86f30c41bb4e11e2169a Parents: b7dfa33 Author: Jay Jin Authored: Thu May 31 21:08:43 2018 +0900 Committer: Renjith Kamath Committed: Wed Jun 13 14:39:14 2018 +0530 -- .../src/app/notebook/notebook-actionBar.html| 11 ++- zeppelin-web/src/app/notebook/notebook.css | 83 ++-- .../src/assets/styles/looknfeel/report.css | 2 +- .../src/assets/styles/looknfeel/simple.css | 2 +- 4 files changed, 31 insertions(+), 67 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9631a7d9/zeppelin-web/src/app/notebook/notebook-actionBar.html -- diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html index b4c608c..a935808 100644 --- a/zeppelin-web/src/app/notebook/notebook-actionBar.html +++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html @@ -14,13 +14,12 @@ limitations under the License. - - + - - + http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9631a7d9/zeppelin-web/src/app/notebook/notebook.css -- diff --git a/zeppelin-web/src/app/notebook/notebook.css b/zeppelin-web/src/app/notebook/notebook.css index 47a7b86..bc9efaa 100644 --- a/zeppelin-web/src/app/notebook/notebook.css +++ b/zeppelin-web/src/app/notebook/notebook.css @@ -73,7 +73,7 @@ } .labelBtn { - padding: .8em .6em .3em; + padding: .8em .4em .3em; font-size: 75%; font-weight: bold; line-height: 1; @@ -154,7 +154,19 @@ color: #33; } -.form-control2 { +.notebook-actionBar-title { + float: left; + width: auto; + max-width: 40%; +} + +@media (max-width: 650px) { + .notebook-actionBar-title { +max-width: 100%; + } +} + +.form-control-title-input { height: 40px; font-size: 29px; line-height: 1.2; @@ -164,72 +176,25 @@ border-radius: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); - padding: 7px 0; - margin: 2px 20px 0 14px; -} - -.form-control-static2 { - padding-top: 7px; - margin-right: 15px; - font-size: 29px; - margin-left: 15px; - padding-bottom: 7px; - margin-bottom: 0; - display: inline-block; - width: auto; - max-width: 97%; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; + margin-left: 1re
zeppelin git commit: [ZEPPELIN-3285] Refine the style of Notebook title
Repository: zeppelin Updated Branches: refs/heads/master ee06cf030 -> b7c3fec95 [ZEPPELIN-3285] Refine the style of Notebook title Refine the style of Notebook title (Ellipsis by character, 100% width under medium width browser, align delete button) (Before) ![before](https://user-images.githubusercontent.com/3839771/40781776-1c420044-6518-11e8-94d6-fc7d5103771b.gif) (After) ![after](https://user-images.githubusercontent.com/3839771/40781830-5bd25dee-6518-11e8-871f-23bbf31507e5.gif) Improvement https://issues.apache.org/jira/browse/ZEPPELIN-3285 **1. Run webapp** ```vi cd zeppelin-web yarn run dev ``` **2. Check the title have ellipsis by character, not looks cut.** ![image](https://user-images.githubusercontent.com/3839771/40782010-f1771e98-6518-11e8-9373-00fbeed75f2d.png) (before / after) **3. Check 'delete button' is aligned** ![image](https://user-images.githubusercontent.com/3839771/40782056-166634aa-6519-11e8-8cbe-8aa7f33f665b.png) ![image](https://user-images.githubusercontent.com/3839771/40782062-1b548f52-6519-11e8-985f-6e79084ce927.png) (before / after) **4. Check the title with is 100% under the window width 650px** ![image](https://user-images.githubusercontent.com/3839771/40782107-40b122e2-6519-11e8-9c01-887df47e7f26.png) (before / after) * 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. * Does the licenses files need update? N * Is there breaking changes for older versions? N * Does this needs documentation? N Author: Jay Jin Closes #2994 from milooy/master and squashes the following commits: 6049ee118 [Jay Jin] ZEPPELIN-3285 Delete left margin of title, ellipsis by word, RWD dba654884 [Jay Jin] ZEPPELIN-3285 Align delete button in action bar Change-Id: I09a2ac9afc4eb2f126f6fcc9a11bb0f972561b69 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b7c3fec9 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b7c3fec9 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b7c3fec9 Branch: refs/heads/master Commit: b7c3fec95daacef66089468ca86832602275a716 Parents: ee06cf0 Author: Jay Jin Authored: Thu May 31 21:08:43 2018 +0900 Committer: Renjith Kamath Committed: Wed Jun 13 14:38:58 2018 +0530 -- .../src/app/notebook/notebook-actionBar.html| 11 ++- zeppelin-web/src/app/notebook/notebook.css | 83 ++-- .../src/assets/styles/looknfeel/report.css | 2 +- .../src/assets/styles/looknfeel/simple.css | 2 +- 4 files changed, 31 insertions(+), 67 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b7c3fec9/zeppelin-web/src/app/notebook/notebook-actionBar.html -- diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html index 9ae7a46..cb49786 100644 --- a/zeppelin-web/src/app/notebook/notebook-actionBar.html +++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html @@ -14,13 +14,12 @@ limitations under the License. - - + - - + http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b7c3fec9/zeppelin-web/src/app/notebook/notebook.css -- diff --git a/zeppelin-web/src/app/notebook/notebook.css b/zeppelin-web/src/app/notebook/notebook.css index 4a85cc0..c72745b 100644 --- a/zeppelin-web/src/app/notebook/notebook.css +++ b/zeppelin-web/src/app/notebook/notebook.css @@ -73,7 +73,7 @@ } .labelBtn { - padding: .8em .6em .3em; + padding: .8em .4em .3em; font-size: 75%; font-weight: bold; line-height: 1; @@ -154,7 +154,19 @@ color: #33; } -.form-control2 { +.notebook-actionBar-title { + float: left; + width: auto; + max-width: 40%; +} + +@media (max-width: 650px) { + .notebook-actionBar-title { +max-width: 100%; + } +} + +.form-control-title-input { height: 40px; font-size: 29px; line-height: 1.2; @@ -164,72 +176,25 @@ border-radius: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); - padding: 7px 0; - margin: 2px 20px 0 14px; -} - -.form-control-static2 { - padding-top: 7px; - margin-right: 15px; - font-size: 29px; - margin-left: 15px; - padding-bottom: 7px; - margin-bottom: 0; - display: inline-block; - width: auto; - max-width: 97%; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; + margin-left: 1rem; + padding-top: 5px; } -.ellipsis { - padding-left: 1em; +.form-control-title { white-space: nowra
zeppelin git commit: [ZEPPELIN-3476] change description "auto-restart interpreter on cron execution"
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 7dfbd060a -> b7dfa330e [ZEPPELIN-3476] change description "auto-restart interpreter on cron execution" Description "auto-restart interpreter on cron execution" is does not quite fit in the sense. Documentation [ZEPPELIN-3476](https://issues.apache.org/jira/browse/ZEPPELIN-3476) ![cron_scheduler_dialog_box](https://user-images.githubusercontent.com/30798933/40646934-4d110526-6333-11e8-90d2-c4feaa1f2c3d.png) Author: Savalek Closes #2991 from Savalek/ZEPPELIN-3476 and squashes the following commits: 4916b0da9 [Savalek] [ZEPPELIN-3476] replace "close" on "stop" d2e9c78ee [Savalek] [ZEPPELIN-3476] change description Change-Id: Ic8a0d283268f843f0ec440b2203c027fea0ffb2b (cherry picked from commit ee06cf030dd9ff83c971dfb9f47f24fb4aae55d4) 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/b7dfa330 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b7dfa330 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b7dfa330 Branch: refs/heads/branch-0.8 Commit: b7dfa330e20a7420074b548a5fbce06d98a1c176 Parents: 7dfbd06 Author: Savalek Authored: Wed May 30 10:40:43 2018 +0300 Committer: Renjith Kamath Committed: Wed Jun 13 14:24:08 2018 +0530 -- .../img/docs-img/cron_scheduler_dialog_box.png | Bin 135264 -> 51362 bytes docs/usage/other_features/cron_scheduler.md | 2 +- .../src/app/notebook/notebook-actionBar.html| 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b7dfa330/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png -- diff --git a/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png b/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png index 5063398..e68af7b 100644 Binary files a/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png and b/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png differ http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b7dfa330/docs/usage/other_features/cron_scheduler.md -- diff --git a/docs/usage/other_features/cron_scheduler.md b/docs/usage/other_features/cron_scheduler.md index 7223045..2a835a3 100644 --- a/docs/usage/other_features/cron_scheduler.md +++ b/docs/usage/other_features/cron_scheduler.md @@ -45,7 +45,7 @@ You can set the cron schedule by filling in this form. Please see [Cron Trigger You can set the cron executing user by filling in this form and press the enter key. -### auto-restart interpreter on cron execution +### After execution stop the interpreter When this checkbox is set to "on", the interpreters which are binded to the notebook are stopped automatically after the cron execution. This feature is useful if you want to release the interpreter resources after the cron execution. http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b7dfa330/zeppelin-web/src/app/notebook/notebook-actionBar.html -- diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html index 2229223..b4c608c 100644 --- a/zeppelin-web/src/app/notebook/notebook-actionBar.html +++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html @@ -282,7 +282,7 @@ limitations under the License. -- auto-restart interpreter on cron execution +- After execution stop the interpreter
zeppelin git commit: [ZEPPELIN-3476] change description "auto-restart interpreter on cron execution"
Repository: zeppelin Updated Branches: refs/heads/master f22bbde1c -> ee06cf030 [ZEPPELIN-3476] change description "auto-restart interpreter on cron execution" Description "auto-restart interpreter on cron execution" is does not quite fit in the sense. Documentation [ZEPPELIN-3476](https://issues.apache.org/jira/browse/ZEPPELIN-3476) ![cron_scheduler_dialog_box](https://user-images.githubusercontent.com/30798933/40646934-4d110526-6333-11e8-90d2-c4feaa1f2c3d.png) Author: Savalek Closes #2991 from Savalek/ZEPPELIN-3476 and squashes the following commits: 4916b0da9 [Savalek] [ZEPPELIN-3476] replace "close" on "stop" d2e9c78ee [Savalek] [ZEPPELIN-3476] change description Change-Id: Ic8a0d283268f843f0ec440b2203c027fea0ffb2b Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ee06cf03 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ee06cf03 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ee06cf03 Branch: refs/heads/master Commit: ee06cf030dd9ff83c971dfb9f47f24fb4aae55d4 Parents: f22bbde Author: Savalek Authored: Wed May 30 10:40:43 2018 +0300 Committer: Renjith Kamath Committed: Wed Jun 13 14:23:42 2018 +0530 -- .../img/docs-img/cron_scheduler_dialog_box.png | Bin 135264 -> 51362 bytes docs/usage/other_features/cron_scheduler.md | 2 +- .../src/app/notebook/notebook-actionBar.html| 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ee06cf03/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png -- diff --git a/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png b/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png index 5063398..e68af7b 100644 Binary files a/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png and b/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png differ http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ee06cf03/docs/usage/other_features/cron_scheduler.md -- diff --git a/docs/usage/other_features/cron_scheduler.md b/docs/usage/other_features/cron_scheduler.md index 7223045..2a835a3 100644 --- a/docs/usage/other_features/cron_scheduler.md +++ b/docs/usage/other_features/cron_scheduler.md @@ -45,7 +45,7 @@ You can set the cron schedule by filling in this form. Please see [Cron Trigger You can set the cron executing user by filling in this form and press the enter key. -### auto-restart interpreter on cron execution +### After execution stop the interpreter When this checkbox is set to "on", the interpreters which are binded to the notebook are stopped automatically after the cron execution. This feature is useful if you want to release the interpreter resources after the cron execution. http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ee06cf03/zeppelin-web/src/app/notebook/notebook-actionBar.html -- diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html index c891ad0..9ae7a46 100644 --- a/zeppelin-web/src/app/notebook/notebook-actionBar.html +++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html @@ -292,7 +292,7 @@ limitations under the License. -- auto-restart interpreter on cron execution +- After execution stop the interpreter
zeppelin git commit: [ZEPPELIN-3492] The paragraph's table does not scroll if there is a large cell
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 fd54540f7 -> 7dfbd060a [ZEPPELIN-3492] The paragraph's table does not scroll if there is a large cell When scrolling (with the mouse wheel), the contents of the table jump and do not scroll down. The scroll bar is working fine. Often this happens if the table has a cell with a large height. [Bug Fix] [ZEPPELIN-3492](https://issues.apache.org/jira/browse/ZEPPELIN-3492) [Text](https://github.com/apache/zeppelin/files/2030555/paragraphText.txt) of the paragraph (python interpreter) ![peek_before](https://user-images.githubusercontent.com/30798933/40417963-c3d158a4-5e89-11e8-8c68-5a0397281c75.gif) ![peek_after](https://user-images.githubusercontent.com/30798933/40417977-ccf60f1a-5e89-11e8-88b3-c7855a198e2d.gif) * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Savalek Closes #2982 from Savalek/ZEPPELIN-3492 and squashes the following commits: 06ef2e616 [Savalek] [ZEPPELIN-3492] fix paragraph's table scroll Change-Id: I22218a65345f7e84d65bd50b0d110ceb86b8ecbf (cherry picked from commit f22bbde1ce83b10f0821e26168cf6cd058b94486) 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/7dfbd060 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7dfbd060 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7dfbd060 Branch: refs/heads/branch-0.8 Commit: 7dfbd060a47980904b59b8d638fa3b9b6efde9ac Parents: fd54540 Author: Savalek Authored: Wed May 23 12:58:30 2018 +0300 Committer: Renjith Kamath Committed: Wed Jun 13 14:21:49 2018 +0530 -- zeppelin-web/src/app/visualization/builtins/visualization-table.js | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7dfbd060/zeppelin-web/src/app/visualization/builtins/visualization-table.js -- diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-table.js b/zeppelin-web/src/app/visualization/builtins/visualization-table.js index 831bf95..30d3291 100644 --- a/zeppelin-web/src/app/visualization/builtins/visualization-table.js +++ b/zeppelin-web/src/app/visualization/builtins/visualization-table.js @@ -153,6 +153,7 @@ export default class TableVisualization extends Visualization { saveTreeView: true, saveFilter: true, saveSelection: false, + customScroller: (uiGrid) => uiGrid.on('wheel', (event) => event.stopPropagation()), }; return gridOptions;
zeppelin git commit: [ZEPPELIN-3492] The paragraph's table does not scroll if there is a large cell
Repository: zeppelin Updated Branches: refs/heads/master 6137c2a81 -> f22bbde1c [ZEPPELIN-3492] The paragraph's table does not scroll if there is a large cell When scrolling (with the mouse wheel), the contents of the table jump and do not scroll down. The scroll bar is working fine. Often this happens if the table has a cell with a large height. [Bug Fix] [ZEPPELIN-3492](https://issues.apache.org/jira/browse/ZEPPELIN-3492) [Text](https://github.com/apache/zeppelin/files/2030555/paragraphText.txt) of the paragraph (python interpreter) ![peek_before](https://user-images.githubusercontent.com/30798933/40417963-c3d158a4-5e89-11e8-8c68-5a0397281c75.gif) ![peek_after](https://user-images.githubusercontent.com/30798933/40417977-ccf60f1a-5e89-11e8-88b3-c7855a198e2d.gif) * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Savalek Closes #2982 from Savalek/ZEPPELIN-3492 and squashes the following commits: 06ef2e616 [Savalek] [ZEPPELIN-3492] fix paragraph's table scroll Change-Id: I22218a65345f7e84d65bd50b0d110ceb86b8ecbf Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f22bbde1 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f22bbde1 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f22bbde1 Branch: refs/heads/master Commit: f22bbde1ce83b10f0821e26168cf6cd058b94486 Parents: 6137c2a Author: Savalek Authored: Wed May 23 12:58:30 2018 +0300 Committer: Renjith Kamath Committed: Wed Jun 13 14:21:16 2018 +0530 -- zeppelin-web/src/app/visualization/builtins/visualization-table.js | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f22bbde1/zeppelin-web/src/app/visualization/builtins/visualization-table.js -- diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-table.js b/zeppelin-web/src/app/visualization/builtins/visualization-table.js index 831bf95..30d3291 100644 --- a/zeppelin-web/src/app/visualization/builtins/visualization-table.js +++ b/zeppelin-web/src/app/visualization/builtins/visualization-table.js @@ -153,6 +153,7 @@ export default class TableVisualization extends Visualization { saveTreeView: true, saveFilter: true, saveSelection: false, + customScroller: (uiGrid) => uiGrid.on('wheel', (event) => event.stopPropagation()), }; return gridOptions;