Skip to content

Commit f5b0805

Browse files
ramaswamydevarajanramaswamydevarajan
committed
Merge branch 'master' of [email protected]:swakrish/incubator-zeppelin.git
2 parents 869b48f + f8bf1f3 commit f5b0805

File tree

32 files changed

+1172
-443
lines changed

32 files changed

+1172
-443
lines changed

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Zeppelin
22

3-
**Documentation:** [User Guide](http://zeppelin.incubator.apache.org/docs/index.html)<br/>
3+
**Documentation:** [User Guide](http://zeppelin.incubator.apache.org/docs/latest/index.html)<br/>
44
**Mailing Lists:** [User and Dev mailing list](http://zeppelin.incubator.apache.org/community.html)<br/>
55
**Continuous Integration:** [![Build Status](https://secure.travis-ci.org/apache/incubator-zeppelin.png?branch=master)](https://travis-ci.org/apache/incubator-zeppelin) <br/>
66
**Contributing:** [Contribution Guide](https://github.com/apache/incubator-zeppelin/blob/master/CONTRIBUTING.md)<br/>
@@ -45,6 +45,7 @@ sudo ln -s /usr/local/apache-maven-3.3.3/bin/mvn /usr/local/bin/mvn
4545
_Notes:_
4646
- Ensure node is installed by running `node --version`
4747
- Ensure maven is running version 3.1.x or higher with `mvn -version`
48+
- Configure maven to use more memory than usual by ```export MAVEN_OPTS="-Xmx2g -XX:MaxPermSize=1024m"```
4849

4950
### Build
5051
If you want to build Zeppelin from the source, please first clone this repository, then:

‎bin/zeppelin-daemon.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ if [[ -d "${ZEPPELIN_HOME}/zeppelin-server/target/classes" ]]; then
6767
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-server/target/classes"
6868
fi
6969

70+
# Add jdbc connector jar
71+
# ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/jdbc/jars/jdbc-connector-jar"
72+
7073
addJarInDir "${ZEPPELIN_HOME}"
7174
addJarInDir "${ZEPPELIN_HOME}/lib"
7275
addJarInDir "${ZEPPELIN_HOME}/zeppelin-interpreter/target/lib"

‎conf/zeppelin-site.xml.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105

106106
<property>
107107
<name>zeppelin.interpreters</name>
108-
<value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.angular.AngularInterpreter,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter,org.apache.zeppelin.tajo.TajoInterpreter,org.apache.zeppelin.flink.FlinkInterpreter,org.apache.zeppelin.lens.LensInterpreter,org.apache.zeppelin.ignite.IgniteInterpreter,org.apache.zeppelin.ignite.IgniteSqlInterpreter,org.apache.zeppelin.cassandra.CassandraInterpreter,org.apache.zeppelin.geode.GeodeOqlInterpreter,org.apache.zeppelin.postgresql.PostgreSqlInterpreter,org.apache.zeppelin.phoenix.PhoenixInterpreter,org.apache.zeppelin.kylin.KylinInterpreter,org.apache.zeppelin.elasticsearch.ElasticsearchInterpreter,org.apache.zeppelin.scalding.ScaldingInterpreter</value>
108+
<value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.angular.AngularInterpreter,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter,org.apache.zeppelin.tajo.TajoInterpreter,org.apache.zeppelin.flink.FlinkInterpreter,org.apache.zeppelin.lens.LensInterpreter,org.apache.zeppelin.ignite.IgniteInterpreter,org.apache.zeppelin.ignite.IgniteSqlInterpreter,org.apache.zeppelin.cassandra.CassandraInterpreter,org.apache.zeppelin.geode.GeodeOqlInterpreter,org.apache.zeppelin.postgresql.PostgreSqlInterpreter,org.apache.zeppelin.jdbc.JDBCInterpreter,org.apache.zeppelin.phoenix.PhoenixInterpreter,org.apache.zeppelin.kylin.KylinInterpreter,org.apache.zeppelin.elasticsearch.ElasticsearchInterpreter,org.apache.zeppelin.scalding.ScaldingInterpreter</value>
109109
<description>Comma separated interpreter configurations. First interpreter become a default</description>
110110
</property>
111111

‎docs/_includes/themes/zeppelin/_navigation.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<a href="#" data-toggle="dropdown" class="dropdown-toggle">Interpreter <b class="caret"></b></a>
3838
<ul class="dropdown-menu">
3939
<li><a href="{{BASE_PATH}}/manual/interpreters.html">Overview</a></li>
40+
<li><a href="{{BASE_PATH}}/manual/dynamicinterpreterload.html">Dynamic Interpreter Loading</a></li>
4041
<li role="separator" class="divider"></li>
4142
<li><a href="{{BASE_PATH}}/interpreter/cassandra.html">Cassandra</a></li>
4243
<li><a href="{{BASE_PATH}}/interpreter/elasticsearch.html">Elasticsearch</a></li>

‎docs/assets/themes/zeppelin/img/docs-img/interpreter_binding_1.png‎

322 KB
Loading

‎docs/assets/themes/zeppelin/img/docs-img/interpreter_binding_2.png‎

298 KB
Loading

‎docs/assets/themes/zeppelin/img/docs-img/interpreter_setting_1.png‎

396 KB
Loading

‎docs/assets/themes/zeppelin/img/docs-img/interpreter_setting_2.png‎

146 KB
Loading

‎docs/assets/themes/zeppelin/img/docs-img/interpreter_setting_3.png‎

257 KB
Loading

‎docs/assets/themes/zeppelin/img/docs-img/zeppelin_user.png‎

325 KB
Loading

0 commit comments

Comments
 (0)