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/15 00:44:17 UTC

[2/5] git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into delete-device-connections

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


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

Branch: refs/heads/delete-device-connections
Commit: d3cce6e8887feaa50e2cfca9dbc4c1e577ad3798
Parents: bf9f69f 27db106
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Oct 14 14:50:50 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Oct 14 14:50:50 2014 -0600

----------------------------------------------------------------------
 .../corepersistence/CpEntityManagerFactory.java       | 13 ++++++++-----
 .../persistence/queue/impl/SQSQueueManagerImpl.java   | 14 +++++++++++---
 .../notifications/ApplicationQueueManager.java        |  5 +++--
 .../services/notifications/NotificationsService.java  |  2 +-
 .../services/notifications/QueueListener.java         |  2 +-
 .../apache/usergrid/services/TestQueueManager.java    |  4 +---
 .../services/notifications/NotifiersServiceIT.java    |  1 +
 7 files changed, 26 insertions(+), 15 deletions(-)
----------------------------------------------------------------------