Merge branch 'hackweek' of github.com:twitter/ambrose into hackweek

twitter-archive · Apr 5, 2013 · 2f42100 · 2f42100
2 parents 20c2a9c + 5baf6ff
commit 2f42100
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/common/src/main/java/com/twitter/ambrose/model/Event.java b/common/src/main/java/com/twitter/ambrose/model/Event.java
@@ -54,7 +54,6 @@ public static enum WorkflowProgressField {
   }
 
   private int id;
-  @JsonIgnore
   private Type type;
   private long timestamp;
   private T payload;
@@ -86,8 +85,8 @@ public static Event<?> fromJson(String json) throws IOException {
   }
 
   /**
-   * Helper method to create instances of the proper event. It is the reposibility of the caller to
-   * assure that their types are aligned with
+   * Helper method to create instances of the proper event. It is the responsibility of the caller
+   * to assure that their types are aligned with the object passed.
    * @param type
    * @param data
    * @return