Merge branch 'two-dot-o-dev' into usergrid-103-upgrade-jersey
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/3343e2d9 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/3343e2d9 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/3343e2d9 Branch: refs/heads/two-dot-o-dev Commit: 3343e2d939c3be681416dff73b6b6c9c92656473 Parents: 1bfa32a 929528a Author: Dave Johnson <[email protected]> Authored: Thu Sep 10 15:22:20 2015 -0400 Committer: Dave Johnson <[email protected]> Committed: Thu Sep 10 15:22:20 2015 -0400 ---------------------------------------------------------------------- .../persistence/entities/Notification.java | 9 +++++++++ .../model/entity/EntityToMapConverter.java | 17 +++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
