You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/16 06:30:51 UTC
[09/15] git commit: Merge branch 'two-dot-o' into
cloudformation-update
Merge branch 'two-dot-o' into cloudformation-update
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/52e10ee3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/52e10ee3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/52e10ee3
Branch: refs/heads/cloudformation-update
Commit: 52e10ee3ec7f16263807e0da13f30f26a7648ff0
Parents: f98ed25 3b12766
Author: Todd Nine <to...@apache.org>
Authored: Wed Oct 15 13:51:21 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Wed Oct 15 13:51:21 2014 -0600
----------------------------------------------------------------------
.../corepersistence/CpRelationManager.java | 10 +-
.../services/devices/DevicesService.java | 49 +++++-
.../notifications/NotificationsService.java | 5 +-
.../services/users/devices/DevicesService.java | 33 ++++
.../AbstractServiceNotificationIT.java | 6 +-
.../apns/NotificationsServiceIT.java | 169 ++++++++++---------
.../gcm/NotificationsServiceIT.java | 153 ++---------------
7 files changed, 188 insertions(+), 237 deletions(-)
----------------------------------------------------------------------