This is an automated email from the ASF dual-hosted git repository. zjffdu pushed a commit to branch branch-0.8 in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/branch-0.8 by this push: new 2ffb5a2 [HOTFIX] Fix compilation error 2ffb5a2 is described below commit 2ffb5a229594da777adb54dc6d1e0ef9305f401a Author: Jeff Zhang <zjf...@apache.org> AuthorDate: Thu Apr 11 13:41:32 2019 +0800 [HOTFIX] Fix compilation error --- .../src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java b/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java index dea9766..5e256f9 100644 --- a/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java +++ b/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java @@ -77,7 +77,6 @@ public class IPythonInterpreterTest { } @Test -<<<<<<< HEAD public void testGrpcFrameSize() throws InterpreterException, IOException { Properties properties = new Properties(); properties.setProperty("zeppelin.ipython.grpc.message_size", "4");