Repository: zeppelin Updated Branches: refs/heads/branch-0.8 9cf254218 -> bcef737a4
[HOTFIX] Build Fix for branch-0.8 ### What is this PR for? HotFix for build issue of branch-0.8 ### What type of PR is it? [Hot Fix] ### How should this be tested? * CI pass ### 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: Jeff Zhang <zjf...@apache.org> Closes #2954 from zjffdu/javadoc_branch-0.8 and squashes the following commits: b4f3e91 [Jeff Zhang] [HOTFIX] Build Fix for branch-0.8 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/bcef737a Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/bcef737a Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/bcef737a Branch: refs/heads/branch-0.8 Commit: bcef737a4df5c4548cf9ee6bbe2daaaac28e5a8c Parents: 9cf2542 Author: Jeff Zhang <zjf...@apache.org> Authored: Wed May 2 15:17:29 2018 +0800 Committer: Jeff Zhang <zjf...@apache.org> Committed: Wed May 2 16:33:49 2018 +0800 ---------------------------------------------------------------------- .../org/apache/zeppelin/bigquery/BigQueryInterpreterTest.java | 1 - .../zeppelin/interpreter/remote/RemoteInterpreterServer.java | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/bcef737a/bigquery/src/test/java/org/apache/zeppelin/bigquery/BigQueryInterpreterTest.java ---------------------------------------------------------------------- diff --git a/bigquery/src/test/java/org/apache/zeppelin/bigquery/BigQueryInterpreterTest.java b/bigquery/src/test/java/org/apache/zeppelin/bigquery/BigQueryInterpreterTest.java index c80e3d5..64c6e17 100644 --- a/bigquery/src/test/java/org/apache/zeppelin/bigquery/BigQueryInterpreterTest.java +++ b/bigquery/src/test/java/org/apache/zeppelin/bigquery/BigQueryInterpreterTest.java @@ -129,5 +129,4 @@ public class BigQueryInterpreterTest { assertEquals("col1\tcol2", lines[0]); assertEquals("1\t2", lines[1]); } ->>>>>>> 0c3b446... ZEPPELIN-3412 Enable query prefix syntax in bigquery interpreter } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/bcef737a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java index be3cc36..2376579 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java @@ -517,7 +517,11 @@ public class RemoteInterpreterServer extends Thread } } - // TODO(jl): Need to extract this class from RemoteInterpreterServer to test it + + + /** + * TODO(jl): Need to extract this class from RemoteInterpreterServer to test it + */ public static class InterpretJob extends Job { private Interpreter interpreter;
