zeppelin git commit: [HOTFIX] fix ZEPPELIN-3198 failures
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.8 b7676ad56 -> 9bf4913a1
[HOTFIX] fix ZEPPELIN-3198 failures
### What is this PR for?
While merging ZEPPELIN-3198(https://github.com/apache/zeppelin/pull/2757), did
not merge ZEPPELIN-3092 and ZEPPELIN-3182 (rebase from master), which is
causing CI to fail.
### What type of PR is it?
[Hot Fix]
### How should this be tested?
* CI should pass
Author: Prabhjyot Singh
Closes #2800 from prabhjyotsingh/hotfix/ZEPPELIN-3198 and squashes the
following commits:
fdf47bb [Prabhjyot Singh] fix ZEPPELIN-3198 related failures
(cherry picked from commit bf923dc13c6051bc1a2622724300c56458d7ca08)
Signed-off-by: Prabhjyot Singh
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9bf4913a
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9bf4913a
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9bf4913a
Branch: refs/heads/branch-0.8
Commit: 9bf4913a1edf4ab0e17a2ecf64ace2dc40020bf0
Parents: b7676ad
Author: Prabhjyot Singh
Authored: Wed Feb 14 16:43:16 2018 +0530
Committer: Prabhjyot Singh
Committed: Thu Feb 15 08:48:16 2018 +0530
--
.../org/apache/zeppelin/notebook/Notebook.java | 6 +++--
.../zeppelin/notebook/repo/GCSNotebookRepo.java | 26
.../notebook/repo/NotebookRepoSync.java | 6 +++--
.../notebook/repo/GitHubNotebookRepoTest.java | 6 ++---
4 files changed, 11 insertions(+), 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9bf4913a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
index b500e71..633072c 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
@@ -369,7 +369,8 @@ public class Notebook implements NoteEventListener {
public Revision checkpointNote(String noteId, String checkpointMessage,
AuthenticationInfo subject) throws IOException {
if (((NotebookRepoSync) notebookRepo).isRevisionSupportedInDefaultRepo()) {
- return ((NotebookRepoWithVersionControl)
notebookRepo).checkpoint(noteId, checkpointMessage, subject);
+ return ((NotebookRepoWithVersionControl) notebookRepo)
+ .checkpoint(noteId, checkpointMessage, subject);
} else {
return null;
@@ -387,7 +388,8 @@ public class Notebook implements NoteEventListener {
public Note setNoteRevision(String noteId, String revisionId,
AuthenticationInfo subject)
throws IOException {
if (((NotebookRepoSync) notebookRepo).isRevisionSupportedInDefaultRepo()) {
- return ((NotebookRepoWithVersionControl)
notebookRepo).setNoteRevision(noteId, revisionId, subject);
+ return ((NotebookRepoWithVersionControl) notebookRepo)
+ .setNoteRevision(noteId, revisionId, subject);
} else {
return null;
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9bf4913a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
index 591c532..6d62298 100644
---
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
+++
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
@@ -196,32 +196,6 @@ public class GCSNotebookRepo implements NotebookRepo {
}
@Override
- public Revision checkpoint(String noteId, String checkpointMsg,
AuthenticationInfo subject)
- throws IOException {
-LOG.warn("checkpoint is not implemented for GCSNotebookRepo");
-return null;
- }
-
- @Override
- public Note get(String noteId, String revId, AuthenticationInfo subject)
throws IOException {
-LOG.warn("get revId is not implemented for GCSNotebookRepo");
-return null;
- }
-
- @Override
- public List revisionHistory(String noteId, AuthenticationInfo
subject) {
-LOG.warn("revisionHistory is not implemented for GCSNotebookRepo");
-return Collections.emptyList();
- }
-
- @Override
- public Note setNoteRevision(String noteId, String revId, AuthenticationInfo
subject)
- throws IOException {
-LOG.warn("setNoteRevision is not implemented for GCSNotebookRepo");
-return null;
- }
-
- @Override
public List getSettings(AuthenticationInfo
subject) {
LOG.warn("getSettings is not imple
zeppelin git commit: [HOTFIX] fix ZEPPELIN-3198 failures
Repository: zeppelin
Updated Branches:
refs/heads/master 0605aae24 -> bf923dc13
[HOTFIX] fix ZEPPELIN-3198 failures
### What is this PR for?
While merging ZEPPELIN-3198(https://github.com/apache/zeppelin/pull/2757), did
not merge ZEPPELIN-3092 and ZEPPELIN-3182 (rebase from master), which is
causing CI to fail.
### What type of PR is it?
[Hot Fix]
### How should this be tested?
* CI should pass
Author: Prabhjyot Singh
Closes #2800 from prabhjyotsingh/hotfix/ZEPPELIN-3198 and squashes the
following commits:
fdf47bb [Prabhjyot Singh] fix ZEPPELIN-3198 related failures
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/bf923dc1
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/bf923dc1
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/bf923dc1
Branch: refs/heads/master
Commit: bf923dc13c6051bc1a2622724300c56458d7ca08
Parents: 0605aae
Author: Prabhjyot Singh
Authored: Wed Feb 14 16:43:16 2018 +0530
Committer: Prabhjyot Singh
Committed: Thu Feb 15 08:47:40 2018 +0530
--
.../org/apache/zeppelin/notebook/Notebook.java | 6 +++--
.../zeppelin/notebook/repo/GCSNotebookRepo.java | 26
.../notebook/repo/NotebookRepoSync.java | 6 +++--
.../notebook/repo/GitHubNotebookRepoTest.java | 6 ++---
4 files changed, 11 insertions(+), 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/bf923dc1/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
index b500e71..633072c 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
@@ -369,7 +369,8 @@ public class Notebook implements NoteEventListener {
public Revision checkpointNote(String noteId, String checkpointMessage,
AuthenticationInfo subject) throws IOException {
if (((NotebookRepoSync) notebookRepo).isRevisionSupportedInDefaultRepo()) {
- return ((NotebookRepoWithVersionControl)
notebookRepo).checkpoint(noteId, checkpointMessage, subject);
+ return ((NotebookRepoWithVersionControl) notebookRepo)
+ .checkpoint(noteId, checkpointMessage, subject);
} else {
return null;
@@ -387,7 +388,8 @@ public class Notebook implements NoteEventListener {
public Note setNoteRevision(String noteId, String revisionId,
AuthenticationInfo subject)
throws IOException {
if (((NotebookRepoSync) notebookRepo).isRevisionSupportedInDefaultRepo()) {
- return ((NotebookRepoWithVersionControl)
notebookRepo).setNoteRevision(noteId, revisionId, subject);
+ return ((NotebookRepoWithVersionControl) notebookRepo)
+ .setNoteRevision(noteId, revisionId, subject);
} else {
return null;
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/bf923dc1/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
index 591c532..6d62298 100644
---
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
+++
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
@@ -196,32 +196,6 @@ public class GCSNotebookRepo implements NotebookRepo {
}
@Override
- public Revision checkpoint(String noteId, String checkpointMsg,
AuthenticationInfo subject)
- throws IOException {
-LOG.warn("checkpoint is not implemented for GCSNotebookRepo");
-return null;
- }
-
- @Override
- public Note get(String noteId, String revId, AuthenticationInfo subject)
throws IOException {
-LOG.warn("get revId is not implemented for GCSNotebookRepo");
-return null;
- }
-
- @Override
- public List revisionHistory(String noteId, AuthenticationInfo
subject) {
-LOG.warn("revisionHistory is not implemented for GCSNotebookRepo");
-return Collections.emptyList();
- }
-
- @Override
- public Note setNoteRevision(String noteId, String revId, AuthenticationInfo
subject)
- throws IOException {
-LOG.warn("setNoteRevision is not implemented for GCSNotebookRepo");
-return null;
- }
-
- @Override
public List getSettings(AuthenticationInfo
subject) {
LOG.warn("getSettings is not implemented for GCSNotebookRepo");
return Collections.emptyList();
http://git-wip-us.apache.org/repos/asf/zep
