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/06/22 15:00:35 UTC
zeppelin git commit: FIX merge mistake on Branch 0.6
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.6 28e582873 -> a7ffc6d02
FIX merge mistake on Branch 0.6
### What is this PR for?
There were some mistake merging https://github.com/apache/zeppelin/pull/998 into branch-0.6
### What type of PR is it?
Hot Fix
### Todos
* [x] - fix mistake
Author: Lee moon soo <mo...@apache.org>
Closes #1065 from Leemoonsoo/branch-0.6-fix and squashes the following commits:
54cd601 [Lee moon soo] Fix merge mistake from https://github.com/apache/zeppelin/pull/998
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a7ffc6d0
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a7ffc6d0
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a7ffc6d0
Branch: refs/heads/branch-0.6
Commit: a7ffc6d02396f888ae58f5345ac3a8eec1c6b7d8
Parents: 28e5828
Author: Lee moon soo <mo...@apache.org>
Authored: Tue Jun 21 23:49:08 2016 -0700
Committer: Lee moon soo <mo...@apache.org>
Committed: Wed Jun 22 08:02:21 2016 -0700
----------------------------------------------------------------------
.../apache/zeppelin/socket/NotebookServer.java | 41 --------------------
1 file changed, 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a7ffc6d0/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
index 857d1a6..6eedbc0 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
@@ -205,12 +205,6 @@ public class NotebookServer extends WebSocketServlet implements
case CHECKPOINT_NOTEBOOK:
checkpointNotebook(conn, notebook, messagereceived);
break;
- case LIST_NOTEBOOK_JOBS:
- unicastNotebookJobInfo(conn, messagereceived);
- break;
- case LIST_UPDATE_NOTEBOOK_JOBS:
- unicastUpdateNotebookJobInfo(conn, messagereceived);
- break;
default:
break;
}
@@ -358,43 +352,8 @@ public class NotebookServer extends WebSocketServlet implements
}
}
-<<<<<<< HEAD
- public List<Map<String, String>> generateNotebooksInfo(boolean needsReload) {
-=======
- public void unicastNotebookJobInfo(NotebookSocket conn, Message fromMessage) throws IOException {
-
- AuthenticationInfo subject = new AuthenticationInfo(fromMessage.principal);
- List<Map<String, Object>> notebookJobs = notebook().getJobListforNotebook(false, 0, subject);
- Map<String, Object> response = new HashMap<>();
-
- response.put("lastResponseUnixTime", System.currentTimeMillis());
- response.put("jobs", notebookJobs);
-
- conn.send(serializeMessage(new Message(OP.LIST_NOTEBOOK_JOBS)
- .put("notebookJobs", response)));
- }
-
- public void unicastUpdateNotebookJobInfo(NotebookSocket conn, Message fromMessage)
- throws IOException {
- double lastUpdateUnixTimeRaw = (double) fromMessage.get("lastUpdateUnixTime");
- long lastUpdateUnixTime = new Double(lastUpdateUnixTimeRaw).longValue();
-
- List<Map<String, Object>> notebookJobs;
- AuthenticationInfo subject = new AuthenticationInfo(fromMessage.principal);
- notebookJobs = notebook().getJobListforNotebook(false, lastUpdateUnixTime, subject);
-
- Map<String, Object> response = new HashMap<>();
- response.put("lastResponseUnixTime", System.currentTimeMillis());
- response.put("jobs", notebookJobs);
-
- conn.send(serializeMessage(new Message(OP.LIST_UPDATE_NOTEBOOK_JOBS)
- .put("notebookRunningJobs", response)));
- }
-
public List<Map<String, String>> generateNotebooksInfo(boolean needsReload,
AuthenticationInfo subject) {
-
->>>>>>> 4a0dce5... Authenticated user aware notebook storage layer
Notebook notebook = notebook();
ZeppelinConfiguration conf = notebook.getConf();