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/10/14 23:00:30 UTC
[06/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into 2.0
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fc7140e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fc7140e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fc7140e4
Branch: refs/heads/cloudformation-update
Commit: fc7140e4ac0f7dc2b91730a638c078dbcb604842
Parents: 519a6d8 bdb9795
Author: amuramoto <am...@apigee.com>
Authored: Tue Oct 7 10:03:45 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Tue Oct 7 10:03:45 2014 -0700
----------------------------------------------------------------------
.../CpEntityIndexDeleteListener.java | 23 +-
.../corepersistence/CpEntityManager.java | 45 +++-
.../corepersistence/CpEntityManagerFactory.java | 5 +-
.../corepersistence/CpManagerCache.java | 29 ++-
.../usergrid/corepersistence/GuiceModule.java | 12 +-
.../usergrid/persistence/map/MapManager.java | 1 -
.../persistence/map/MapManagerFactory.java | 2 +-
.../persistence/map/impl/MapManagerImpl.java | 24 ---
.../persistence/map/impl/MapScopeImpl.java | 1 -
.../map/impl/MapSerializationImpl.java | 48 +++--
.../persistence/map/MapManagerTest.java | 21 +-
.../index/impl/EsEntityIndexImpl.java | 208 ++++++++++---------
.../notifications/ApplicationQueueManager.java | 11 +-
.../notifications/NotificationsService.java | 3 +-
.../services/notifications/QueueListener.java | 8 +-
.../services/notifications/TaskManager.java | 22 +-
.../usergrid/services/TestQueueManager.java | 67 ++++++
.../AbstractServiceNotificationIT.java | 1 -
.../apns/NotificationsServiceIT.java | 9 +-
.../gcm/NotificationsServiceIT.java | 7 +-
20 files changed, 333 insertions(+), 214 deletions(-)
----------------------------------------------------------------------