Permalink
Browse files

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

  • Loading branch information...
2 parents 20c2a9c + 5baf6ff commit 2f4210087a76d421236b0532d1c2ba6629a88dcc @sagemintblue sagemintblue committed Apr 5, 2013
Showing with 2 additions and 3 deletions.
  1. +2 −3 common/src/main/java/com/twitter/ambrose/model/Event.java
@@ -54,7 +54,6 @@
}
private int id;
- @JsonIgnore
private Type type;
private long timestamp;
private T payload;
@@ -86,8 +85,8 @@ public String toJson() 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

0 comments on commit 2f42100

Please sign in to comment.