zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mina...@apache.org
Subject zeppelin git commit: [HOTFIX] Fix compile error caused by merging #1043
Date Thu, 23 Jun 2016 06:16:37 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.6 dfe758f1f -> 09b48cccd


[HOTFIX] Fix compile error caused by merging #1043

### What is this PR for?
Hotfix for compile error of master, branch-0.6 after merging #1043

Author: Mina Lee <minalee@apache.org>

Closes #1070 from minahlee/hotfix/compile_error and squashes the following commits:

b0d5a6b [Mina Lee] Fix compile error after merging #1043

(cherry picked from commit 83602f5c26cdbaab4997d7c5567cecd1c5b9ea4a)
Signed-off-by: Mina Lee <minalee@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/09b48ccc
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/09b48ccc
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/09b48ccc

Branch: refs/heads/branch-0.6
Commit: 09b48cccd441363057707b870871dccec1b312b1
Parents: dfe758f
Author: Mina Lee <minalee@apache.org>
Authored: Wed Jun 22 22:31:09 2016 -0700
Committer: Mina Lee <minalee@apache.org>
Committed: Wed Jun 22 23:16:22 2016 -0700

----------------------------------------------------------------------
 .../test/java/org/apache/zeppelin/notebook/NotebookTest.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/09b48ccc/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
index 575bb85..0305b21 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
@@ -325,7 +325,7 @@ public class NotebookTest implements JobListenerFactory{
   @Test
   public void testExportAndImportNote() throws IOException, CloneNotSupportedException,
           InterruptedException {
-    Note note = notebook.createNote();
+    Note note = notebook.createNote(null);
     note.getNoteReplLoader().setInterpreters(factory.getDefaultInterpreterSettingList());
 
     final Paragraph p = note.addParagraph();
@@ -339,7 +339,7 @@ public class NotebookTest implements JobListenerFactory{
 
     String exportedNoteJson = notebook.exportNote(note.getId());
 
-    Note importedNote = notebook.importNote(exportedNoteJson, "Title");
+    Note importedNote = notebook.importNote(exportedNoteJson, "Title", null);
 
     Paragraph p2 = importedNote.getParagraphs().get(0);
 
@@ -374,7 +374,7 @@ public class NotebookTest implements JobListenerFactory{
   @Test
   public void testCloneNoteWithExceptionResult() throws IOException, CloneNotSupportedException,
       InterruptedException {
-    Note note = notebook.createNote();
+    Note note = notebook.createNote(null);
     note.getNoteReplLoader().setInterpreters(factory.getDefaultInterpreterSettingList());
 
     final Paragraph p = note.addParagraph();
@@ -386,7 +386,7 @@ public class NotebookTest implements JobListenerFactory{
     // Force paragraph to have String type object
     p.setResult("Exception");
 
-    Note cloneNote = notebook.cloneNote(note.getId(), "clone note with Exception result");
+    Note cloneNote = notebook.cloneNote(note.getId(), "clone note with Exception result",
null);
     Paragraph cp = cloneNote.paragraphs.get(0);
 
     // Keep same ParagraphID


Mime
View raw message