You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/10/08 17:40:54 UTC
[5/5] git commit: Merge branch 'two-dot-o' into two-dot-o-events
Merge branch 'two-dot-o' into two-dot-o-events
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c0c108f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c0c108f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c0c108f7
Branch: refs/heads/two-dot-o-events
Commit: c0c108f78c7fcc60cd2f199843573d5841a545ee
Parents: abd4014 13ae49b
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Oct 8 09:40:21 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Oct 8 09:40:21 2014 -0600
----------------------------------------------------------------------
.../persistence/entities/Notification.java | 13 +++
.../collection/EntityCollectionManagerIT.java | 32 +++++-
.../queue/impl/SQSQueueManagerImpl.java | 2 +-
.../notifications/ApplicationQueueManager.java | 12 +--
.../services/notifications/TaskManager.java | 102 ++++++++++---------
.../apns/NotificationsServiceIT.java | 12 +++
.../gcm/NotificationsServiceIT.java | 10 ++
7 files changed, 123 insertions(+), 60 deletions(-)
----------------------------------------------------------------------