Repository: zeppelin Updated Branches: refs/heads/master c020b2926 -> 1587b8686
ZEPPELIN-925 Part 2. Merge Hive Interpreter into JDBC ### What is this PR for? Fixed some wrong documentation and settings. This is minor issue. ### What type of PR is it? [Feature | Documentation] ### Todos * [x] - Remove settings about Hive and documentation ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-925 ### How should this be tested? ### 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: Jongyoul Lee <jongy...@gmail.com> Closes #981 from jongyoul/ZEPPELIN-925-1 and squashes the following commits: 04d0e89 [Jongyoul Lee] Fixed typo from "Hive" to "Apache Hive" 0de0c41 [Jongyoul Lee] Removed unused settings and description Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/1587b868 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/1587b868 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/1587b868 Branch: refs/heads/master Commit: 1587b8686b66f07aa3234625712af1d1e40e92d5 Parents: c020b29 Author: Jongyoul Lee <jongy...@gmail.com> Authored: Fri Jun 10 01:12:04 2016 +0900 Committer: Mina Lee <mina...@apache.org> Committed: Tue Jun 14 15:07:44 2016 -0700 ---------------------------------------------------------------------- CONTRIBUTING.md | 1 - docs/interpreter/jdbc.md | 2 +- docs/rest-api/rest-configuration.md | 2 +- .../main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1587b868/CONTRIBUTING.md ---------------------------------------------------------------------- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 787e17d..2c87aad 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -109,7 +109,6 @@ The top-level pom.xml describes the basic project structure. Currently Zeppelin <module>markdown</module> <module>angular</module> <module>shell</module> - <module>hive</module> <module>flink</module> <module>ignite</module> <module>lens</module> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1587b868/docs/interpreter/jdbc.md ---------------------------------------------------------------------- diff --git a/docs/interpreter/jdbc.md b/docs/interpreter/jdbc.md index 5acadff..6783aac 100644 --- a/docs/interpreter/jdbc.md +++ b/docs/interpreter/jdbc.md @@ -15,7 +15,7 @@ This interpreter lets you create a JDBC connection to any data source, by now it * MySql * MariaDB * Redshift -* Hive +* Apache Hive * Apache Drill * Details on using [Drill JDBC Driver](https://drill.apache.org/docs/using-the-jdbc-driver) * Apache Tajo http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1587b868/docs/rest-api/rest-configuration.md ---------------------------------------------------------------------- diff --git a/docs/rest-api/rest-configuration.md b/docs/rest-api/rest-configuration.md index 250a2f5..45cccec 100644 --- a/docs/rest-api/rest-configuration.md +++ b/docs/rest-api/rest-configuration.md @@ -73,7 +73,7 @@ limitations under the License. "zeppelin.server.context.path": "/", "zeppelin.ssl.keystore.type": "JKS", "zeppelin.ssl.truststore.path": "truststore", - "zeppelin.interpreters": "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.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", + "zeppelin.interpreters": "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.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", "zeppelin.ssl": "false", "zeppelin.notebook.autoInterpreterBinding": "true", "zeppelin.notebook.homescreen": "", http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1587b868/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java index 7572ade..5094901 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java @@ -487,7 +487,6 @@ public class ZeppelinConfiguration extends XMLConfiguration { + "org.apache.zeppelin.livy.LivySparkSQLInterpreter," + "org.apache.zeppelin.livy.LivyPySparkInterpreter," + "org.apache.zeppelin.livy.LivySparkRInterpreter," - + "org.apache.zeppelin.hive.HiveInterpreter," + "org.apache.zeppelin.alluxio.AlluxioInterpreter," + "org.apache.zeppelin.file.HDFSFileInterpreter," + "org.apache.zeppelin.phoenix.PhoenixInterpreter,"
