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 2015/03/13 19:24:28 UTC
[3/4] incubator-usergrid git commit: Merge branch 'USERGRID-466' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-466
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-change-write-consistency
Commit: 9d00c2235111954abbbcf9e26afacca74df1c1bd
Parents: a1b557d 361060e
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Mar 13 12:23:53 2015 -0600
Committer: Shawn Feldman <sf...@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(-)
----------------------------------------------------------------------