zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject zeppelin git commit: [ZEPPELIN-1519] Fix notebook importer AM/PM omission problem
Date Fri, 07 Oct 2016 00:51:18 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/master de2d6e495 -> 2771ba0b3


[ZEPPELIN-1519] Fix notebook importer AM/PM omission problem

### What is this PR for?
When loading note from storage (or importing note), AM/PM informations are gone. So dates
are always in AM.
Fix this problem.

### What type of PR is it?
Bug Fix

### Todos

### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-1519

### How should this be tested?
Do some changes on sample notebooks, and see file changes.

### 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: Sangmin Yoon <sixmen@gmail.com>

Closes #1488 from sixmen/fix-date-import and squashes the following commits:

b7af5c5 [Sangmin Yoon] restore removed date pattern
833e512 [Sangmin Yoon] fix notebook importer AM/PM omission problem


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

Branch: refs/heads/master
Commit: 2771ba0b3360f77aab6736eeabee352946d998a6
Parents: de2d6e4
Author: Sangmin Yoon <sixmen@gmail.com>
Authored: Thu Oct 6 11:02:58 2016 +0900
Committer: Lee moon soo <moon@apache.org>
Committed: Fri Oct 7 09:51:08 2016 +0900

----------------------------------------------------------------------
 .../org/apache/zeppelin/notebook/NotebookImportDeserializer.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2771ba0b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookImportDeserializer.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookImportDeserializer.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookImportDeserializer.java
index 1aadf75..86e0f0b 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookImportDeserializer.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookImportDeserializer.java
@@ -35,6 +35,7 @@ import java.util.Locale;
 public class NotebookImportDeserializer implements JsonDeserializer<Date> {
   private static final String[] DATE_FORMATS = new String[] {
     "yyyy-MM-dd'T'HH:mm:ssZ",
+    "MMM d, yyyy h:mm:ss a",
     "MMM dd, yyyy HH:mm:ss"
   };
 


Mime
View raw message