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/11/04 23:59:26 UTC
[04/14] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into two-dot-o
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dafb27e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dafb27e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dafb27e6
Branch: refs/heads/key-row-sharding
Commit: dafb27e6b9817b9beb16be92f50e6432b8482b6d
Parents: 2aa0953 fc3c42c
Author: ryan bridges <rb...@apigee.com>
Authored: Fri Oct 24 12:33:53 2014 -0400
Committer: ryan bridges <rb...@apigee.com>
Committed: Fri Oct 24 12:33:53 2014 -0400
----------------------------------------------------------------------
.../main/groovy/configure_elasticsearch.groovy | 2 +-
.../src/main/groovy/configure_usergrid.groovy | 6 +-
.../usergrid/persistence/queue/QueueFig.java | 3 +
.../persistence/queue/QueueScopeFactory.java | 34 +++++++++
.../persistence/queue/guice/QueueModule.java | 10 ++-
.../queue/impl/QueueScopeFactoryImpl.java | 47 ++++++++++++
.../queue/impl/SQSQueueManagerImpl.java | 76 +++++++++++---------
.../persistence/queue/QueueManagerTest.java | 27 +++++--
stack/loadtests/gatling/scripts/gatling-ug.sh | 6 ++
.../usergrid/rest/TextToJsonSwapWriter.java | 8 ++-
.../applications/ApplicationResourceIT.java | 2 -
.../usergrid/rest/management/AdminUsersIT.java | 6 --
.../notifications/ApplicationQueueManager.java | 1 -
.../notifications/NotificationsService.java | 5 +-
.../services/notifications/QueueListener.java | 5 +-
15 files changed, 183 insertions(+), 55 deletions(-)
----------------------------------------------------------------------