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/09/29 22:53:15 UTC

[36/52] [abbrv] 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/a200f45d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a200f45d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a200f45d

Branch: refs/heads/eventsystem
Commit: a200f45db15fd45be7bf2ef49b3bba12d5b051c3
Parents: 43b85a6 0dc230d
Author: Dave Johnson <dm...@apigee.com>
Authored: Sat Sep 27 10:56:15 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Sat Sep 27 10:56:15 2014 -0400

----------------------------------------------------------------------
 .../notifications/ApplicationQueueManager.java  | 38 +++++++++++---------
 .../notifications/NotificationsService.java     |  7 ++--
 .../notifications/NotificationsTaskManager.java | 33 -----------------
 .../services/notifications/QueueListener.java   | 20 +++++------
 .../services/notifications/QueueManager.java    |  4 ---
 .../notifications/SingleQueueTaskManager.java   | 10 +++---
 .../services/notifications/TaskTracker.java     |  4 +--
 .../apns/NotificationsServiceIT.java            |  4 ++-
 .../gcm/NotificationsServiceIT.java             |  4 ++-
 9 files changed, 47 insertions(+), 77 deletions(-)
----------------------------------------------------------------------