You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/10/17 21:12:46 UTC
[5/8] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7c06f6bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7c06f6bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7c06f6bb
Branch: refs/heads/two-dot-o
Commit: 7c06f6bbba61fb5df7647a7dcbe77efa000a7d16
Parents: 2c5e6f5 dbdba30
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Oct 16 07:51:31 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Oct 16 07:51:31 2014 -0400
----------------------------------------------------------------------
.../corepersistence/CpRelationManager.java | 10 +-
.../usergrid/corepersistence/CpSetup.java | 3 +
.../queue/impl/SQSQueueManagerImpl.java | 2 +-
.../services/devices/DevicesService.java | 49 +++++-
.../notifications/ApplicationQueueManager.java | 5 +-
.../notifications/NotificationsService.java | 7 +-
.../services/notifications/QueueListener.java | 2 +-
.../services/users/devices/DevicesService.java | 33 ++++
.../AbstractServiceNotificationIT.java | 6 +-
.../apns/NotificationsServiceIT.java | 173 ++++++++++---------
.../gcm/NotificationsServiceIT.java | 164 ++----------------
11 files changed, 202 insertions(+), 252 deletions(-)
----------------------------------------------------------------------