usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [07/11] incubator-usergrid git commit: Merge branch 'USERGRID-466' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-466
Date Sun, 15 Mar 2015 21:34:56 GMT
Merge branch 'USERGRID-466' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
USERGRID-466

Conflicts:
	stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java


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

Branch: refs/heads/USERGRID-466
Commit: 9d00c2235111954abbbcf9e26afacca74df1c1bd
Parents: a1b557d 361060e
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Fri Mar 13 12:23:53 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Fri Mar 13 12:23:53 2015 -0600

----------------------------------------------------------------------
 .../main/groovy/configure_elasticsearch.groovy  |   1 -
 .../persistence/index/guice/QueueProvider.java  | 116 +++++++++++++++++++
 .../usergrid/persistence/queue/QueueScope.java  |   2 +-
 .../persistence/queue/QueueScopeFactory.java    |  34 ------
 .../persistence/queue/guice/QueueModule.java    |  17 ++-
 .../queue/impl/QueueScopeFactoryImpl.java       |  48 --------
 .../persistence/queue/impl/QueueScopeImpl.java  |  27 +----
 .../queue/impl/SQSQueueManagerImpl.java         |   6 +-
 .../persistence/queue/NoAWSCredsRule.java       |  81 +++++++++++++
 .../persistence/queue/QueueManagerTest.java     |  31 ++---
 .../services/notifications/QueueListener.java   |   5 +-
 .../usergrid/services/queues/QueueListener.java |   5 +-
 12 files changed, 232 insertions(+), 141 deletions(-)
----------------------------------------------------------------------



Mime
View raw message