Skip to content

Commit 52eb1bd

Browse files
djoelz-tssrdjoelz-tssr
committed
Conflicts: zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTests.java zeppelin-server/src/test/java/org/apache/zeppelin/socket/TestHttpServletRequest.java test
2 parents 013f22d + 7f7a7c4 commit 52eb1bd

File tree

53 files changed

+1977
-334
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1977
-334
lines changed

‎angular/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<artifactId>zeppelin</artifactId>
2424
<groupId>org.apache.zeppelin</groupId>
2525
<version>0.6.0-incubating-SNAPSHOT</version>
26+
<relativePath>..</relativePath>
2627
</parent>
2728

2829
<groupId>org.apache.zeppelin</groupId>

‎cassandra/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<artifactId>zeppelin</artifactId>
2424
<groupId>org.apache.zeppelin</groupId>
2525
<version>0.6.0-incubating-SNAPSHOT</version>
26+
<relativePath>..</relativePath>
2627
</parent>
2728

2829
<groupId>org.apache.zeppelin</groupId>

‎conf/zeppelin-env.sh.template‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
# export ZEPPELIN_LOG_DIR # Where log files are stored. PWD by default.
2727
# export ZEPPELIN_PID_DIR # The pid files are stored. /tmp by default.
2828
# export ZEPPELIN_NOTEBOOK_DIR # Where notebook saved
29+
# export ZEPPELIN_NOTEBOOK_HOMESCREEN # Id of notebook to be displayed in homescreen. ex) 2A94M5J1Z
30+
# export ZEPPELIN_NOTEBOOK_HOMESCREEN_HIDE # hide homescreen notebook from list when this value set to "true". default "false"
2931
# export ZEPPELIN_NOTEBOOK_S3_BUCKET # Bucket where notebook saved
3032
# export ZEPPELIN_NOTEBOOK_S3_USER # User in bucket where notebook saved. For example bucket/user/notebook/2A94M5J1Z/note.json
3133
# export ZEPPELIN_IDENT_STRING # A string representing this instance of zeppelin. $USER by default.

‎conf/zeppelin-site.xml.template‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,19 @@
3737
<description>path or URI for notebook persist</description>
3838
</property>
3939

40+
<property>
41+
<name>zeppelin.notebook.homescreen</name>
42+
<value></value>
43+
<description>id of notebook to be displayed in homescreen. ex) 2A94M5J1Z Empty value displays default home screen</description>
44+
</property>
45+
46+
<property>
47+
<name>zeppelin.notebook.homescreen.hide</name>
48+
<value>false</value>
49+
<description>hide homescreen notebook from list when this value set to true</description>
50+
</property>
51+
52+
4053
<!-- If used S3 to storage the notebooks, it is necessary the following folder structure bucketname/username/notebook/ -->
4154
<!--
4255
<property>

‎flink/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<artifactId>zeppelin</artifactId>
2424
<groupId>org.apache.zeppelin</groupId>
2525
<version>0.6.0-incubating-SNAPSHOT</version>
26+
<relativePath>..</relativePath>
2627
</parent>
2728

2829
<groupId>org.apache.zeppelin</groupId>

‎hive/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<artifactId>zeppelin</artifactId>
2424
<groupId>org.apache.zeppelin</groupId>
2525
<version>0.6.0-incubating-SNAPSHOT</version>
26+
<relativePath>..</relativePath>
2627
</parent>
2728

2829
<groupId>org.apache.zeppelin</groupId>

‎ignite/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<artifactId>zeppelin</artifactId>
2424
<groupId>org.apache.zeppelin</groupId>
2525
<version>0.6.0-incubating-SNAPSHOT</version>
26+
<relativePath>..</relativePath>
2627
</parent>
2728

2829
<artifactId>zeppelin-ignite</artifactId>

‎lens/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<artifactId>zeppelin</artifactId>
2424
<groupId>org.apache.zeppelin</groupId>
2525
<version>0.6.0-incubating-SNAPSHOT</version>
26+
<relativePath>..</relativePath>
2627
</parent>
2728

2829
<groupId>org.apache.zeppelin</groupId>

‎markdown/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<artifactId>zeppelin</artifactId>
2424
<groupId>org.apache.zeppelin</groupId>
2525
<version>0.6.0-incubating-SNAPSHOT</version>
26+
<relativePath>..</relativePath>
2627
</parent>
2728

2829
<groupId>org.apache.zeppelin</groupId>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<properties>
107107
<slf4j.version>1.7.10</slf4j.version>
108108
<log4j.version>1.2.17</log4j.version>
109-
<libthrift.version>0.9.0</libthrift.version>
109+
<libthrift.version>0.9.2</libthrift.version>
110110
<gson.version>2.2</gson.version>
111111
<guava.version>15.0</guava.version>
112112

0 commit comments

Comments
 (0)