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 2015/05/28 21:43:26 UTC
[50/50] [abbrv] incubator-usergrid git commit: Merge branch
'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
into two-dot-o-dev
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/db425d5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/db425d5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/db425d5f
Branch: refs/heads/two-dot-o-dev
Commit: db425d5fdd9247d7f57ae254ca416b17f8f0724e
Parents: 265f84b e70f047
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu May 28 15:42:09 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu May 28 15:42:09 2015 -0400
----------------------------------------------------------------------
.../asyncevents/AmazonAsyncEventService.java | 4 +-
.../org/apache/usergrid/persistence/Query.java | 6 +-
.../persistence/queue/DefaultQueueManager.java | 6 +-
.../persistence/queue/QueueManager.java | 4 +-
.../queue/impl/SNSQueueManagerImpl.java | 6 +-
.../queue/impl/SQSQueueManagerImpl.java | 6 +-
.../persistence/queue/QueueManagerTest.java | 8 +--
.../services/notifications/QueueListener.java | 2 +-
.../services/queues/ImportQueueManager.java | 5 +-
.../usergrid/services/queues/QueueListener.java | 75 ++++++++++----------
10 files changed, 67 insertions(+), 55 deletions(-)
----------------------------------------------------------------------