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/22 18:23:30 UTC

[59/65] [abbrv] git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into loadtest

Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into loadtest


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ee147191
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ee147191
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ee147191

Branch: refs/heads/two-dot-o
Commit: ee147191aa5051cea5d0e8c2d8d87f88f7f37b31
Parents: 6614b6e 19556e2
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Oct 21 14:32:09 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Oct 21 14:32:09 2014 -0600

----------------------------------------------------------------------
 .../push/push-send-notification-controller.js   | 44 ++++++++++++--------
 .../notifications/NotificationsService.java     |  4 +-
 .../services/notifications/TaskManager.java     |  7 +++-
 3 files changed, 34 insertions(+), 21 deletions(-)
----------------------------------------------------------------------