You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2016/01/13 07:07:57 UTC
incubator-zeppelin git commit: ZEPPELIN-596 Use default marshaller in
Ignite interpreter by default
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master e17cf6634 -> d277c510f
ZEPPELIN-596 Use default marshaller in Ignite interpreter by default
Author: agura <ag...@gridgain.com>
Closes #624 from agura/zeppelin-596 and squashes the following commits:
f93a2d5 [agura] ZEPPELIN-596 Use default marshaller in Ignite interpreter by default
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/d277c510
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/d277c510
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/d277c510
Branch: refs/heads/master
Commit: d277c510f473100c7f21c0639a69b888f62f06ba
Parents: e17cf66
Author: agura <ag...@gridgain.com>
Authored: Tue Jan 12 12:59:01 2016 +0300
Committer: Lee moon soo <mo...@apache.org>
Committed: Tue Jan 12 22:10:07 2016 -0800
----------------------------------------------------------------------
ignite/src/main/resources/default-ignite-jdbc.xml | 7 -------
.../org/apache/zeppelin/ignite/IgniteSqlInterpreterTest.java | 1 -
2 files changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/d277c510/ignite/src/main/resources/default-ignite-jdbc.xml
----------------------------------------------------------------------
diff --git a/ignite/src/main/resources/default-ignite-jdbc.xml b/ignite/src/main/resources/default-ignite-jdbc.xml
index 96ed2de..94c12b1 100644
--- a/ignite/src/main/resources/default-ignite-jdbc.xml
+++ b/ignite/src/main/resources/default-ignite-jdbc.xml
@@ -33,13 +33,6 @@
<property name="peerClassLoadingEnabled" value="true"/>
- <property name="marshaller">
- <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
- <!-- Set to false to allow non-serializable objects in examples, default is true. -->
- <property name="requireSerializable" value="false"/>
- </bean>
- </property>
-
<!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
<property name="discoverySpi">
<bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/d277c510/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteSqlInterpreterTest.java
----------------------------------------------------------------------
diff --git a/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteSqlInterpreterTest.java b/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteSqlInterpreterTest.java
index d6915ac..fb93ad5 100644
--- a/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteSqlInterpreterTest.java
+++ b/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteSqlInterpreterTest.java
@@ -60,7 +60,6 @@ public class IgniteSqlInterpreterTest {
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setDiscoverySpi(discoSpi);
cfg.setPeerClassLoadingEnabled(true);
- cfg.setMarshaller(new OptimizedMarshaller());
cfg.setGridName("test");