You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by bz...@apache.org on 2016/01/05 09:52:46 UTC
incubator-zeppelin git commit: ZEPPELIN-545. Include Ignite
1.5.0.final into next release of Zeppelin
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 0849ea97a -> 496dd22c2
ZEPPELIN-545. Include Ignite 1.5.0.final into next release of Zeppelin
Ready for the review. The latest Ignite release will be published in the next day or so
Author: Cos <co...@apache.org>
Closes #584 from c0s/master and squashes the following commits:
6d53e8d [Cos] ZEPPELIN-545. Include Ignite 1.5.0.final into next release of Zeppelin
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/496dd22c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/496dd22c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/496dd22c
Branch: refs/heads/master
Commit: 496dd22c2877e50b564052f5c4f5e8fbc6910eba
Parents: 0849ea9
Author: Cos <co...@apache.org>
Authored: Wed Dec 30 18:17:12 2015 -0800
Committer: Alexander Bezzubov <bz...@apache.org>
Committed: Tue Jan 5 17:52:11 2016 +0900
----------------------------------------------------------------------
ignite/pom.xml | 2 +-
.../java/org/apache/zeppelin/ignite/IgniteSqlInterpreterTest.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/496dd22c/ignite/pom.xml
----------------------------------------------------------------------
diff --git a/ignite/pom.xml b/ignite/pom.xml
index 1f4bfc4..c0f47f1 100644
--- a/ignite/pom.xml
+++ b/ignite/pom.xml
@@ -33,7 +33,7 @@
<url>http://zeppelin.incubator.apache.org</url>
<properties>
- <ignite.version>1.4.0</ignite.version>
+ <ignite.version>1.5.0.final</ignite.version>
<ignite.scala.binary.version>2.10</ignite.scala.binary.version>
<ignite.scala.version>2.10.4</ignite.scala.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/496dd22c/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 3843704..d6915ac 100644
--- a/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteSqlInterpreterTest.java
+++ b/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteSqlInterpreterTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.zeppelin.interpreter.InterpreterContext;
@@ -59,6 +60,7 @@ public class IgniteSqlInterpreterTest {
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setDiscoverySpi(discoSpi);
cfg.setPeerClassLoadingEnabled(true);
+ cfg.setMarshaller(new OptimizedMarshaller());
cfg.setGridName("test");