Skip to content

Commit 80bd58c

Browse files
ankur-jain-yashankur-jain-yash
committed
Merge branch 'upstream/master'
Conflicts: docs/interpreter/R.md zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js zeppelin-web/src/app/notebook/paragraph/paragraph.css
2 parents adb66a3 + 0ee76b1 commit 80bd58c

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

‎conf/zeppelin-site.xml.template‎

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

145145
<property>
146146
<name>zeppelin.interpreters</name>
147-
<value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.spark.SparkRInterpreter,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.file.HDFSFileInterpreter,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,org.apache.zeppelin.alluxio.AlluxioInterpreter,org.apache.zeppelin.hbase.HbaseInterpreter,org.apache.zeppelin.rinterpreter.KnitR,org.apache.zeppelin.rinterpreter.RRepl</value>
147+
<value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.rinterpreter.RRepl,org.apache.zeppelin.rinterpreter.KnitR,org.apache.zeppelin.spark.SparkRInterpreter,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.file.HDFSFileInterpreter,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,org.apache.zeppelin.alluxio.AlluxioInterpreter,org.apache.zeppelin.hbase.HbaseInterpreter</value>
148148
<description>Comma separated interpreter configurations. First interpreter become a default</description>
149149
</property>
150150

‎file/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<artifactId>zeppelin-file</artifactId>
3030
<packaging>jar</packaging>
3131
<version>0.6.0-incubating-SNAPSHOT</version>
32-
<name>Zeppelin File System Interpreters</name>
32+
<name>Zeppelin: File System Interpreters</name>
3333
<url>http://www.apache.org</url>
3434

3535
<dependencies>

‎zeppelin-web/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
<goal>install-node-and-npm</goal>
9696
</goals>
9797
<configuration>
98-
<nodeVersion>v0.10.22</nodeVersion>
99-
<npmVersion>1.3.8</npmVersion>
98+
<nodeVersion>v0.12.13</nodeVersion>
99+
<npmVersion>2.15.0</npmVersion>
100100
</configuration>
101101
</execution>
102102

‎zeppelin-web/src/app/notebook/paragraph/paragraph-chart-selector.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@
4141
ng-click="setGraphMode('scatterChart', true)"><i class="cf cf-scatter-chart"></i>
4242
</button>
4343
</div>
44+
<div id="{{paragraph.id}}_search"
45+
ng-if="paragraph.result.type == 'TABLE' && !asIframe && !viewOnly"
46+
class="btn-group"
47+
style='margin-bottom: 10px;'>
48+
<input type="search" class="form-control input-sm" id="{{paragraph.id}}_search_input" placeholder="Search records" >
49+
</div>
50+
4451
<span ng-if="getResultType()=='TABLE' && getGraphMode()!='table' && !asIframe && !viewOnly"
4552
style="margin-left:10px; cursor:pointer; display: inline-block; vertical-align:top; position: relative; line-height:30px;">
4653
<a class="btnText" ng-click="toggleGraphOption()">

‎zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java‎

100755100644
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,8 @@ public static enum ConfVars {
451451
ZEPPELIN_WAR_TEMPDIR("zeppelin.war.tempdir", "webapps"),
452452
ZEPPELIN_INTERPRETERS("zeppelin.interpreters", "org.apache.zeppelin.spark.SparkInterpreter,"
453453
+ "org.apache.zeppelin.spark.PySparkInterpreter,"
454+
+ "org.apache.zeppelin.rinterpreter.RRepl,"
455+
+ "org.apache.zeppelin.rinterpreter.KnitR,"
454456
+ "org.apache.zeppelin.spark.SparkRInterpreter,"
455457
+ "org.apache.zeppelin.spark.SparkSqlInterpreter,"
456458
+ "org.apache.zeppelin.spark.DepInterpreter,"
@@ -473,9 +475,7 @@ public static enum ConfVars {
473475
+ "org.apache.zeppelin.elasticsearch.ElasticsearchInterpreter,"
474476
+ "org.apache.zeppelin.scalding.ScaldingInterpreter,"
475477
+ "org.apache.zeppelin.jdbc.JDBCInterpreter,"
476-
+ "org.apache.zeppelin.hbase.HbaseInterpreter,"
477-
+ "org.apache.zeppelin.rinterpreter.RRepl,"
478-
+ "org.apache.zeppelin.rinterpreter.KnitR"),
478+
+ "org.apache.zeppelin.hbase.HbaseInterpreter"),
479479
ZEPPELIN_INTERPRETER_DIR("zeppelin.interpreter.dir", "interpreter"),
480480
ZEPPELIN_INTERPRETER_LOCALREPO("zeppelin.interpreter.localRepo", "local-repo"),
481481
ZEPPELIN_INTERPRETER_CONNECT_TIMEOUT("zeppelin.interpreter.connect.timeout", 30000),

0 commit comments

Comments
 (0)