You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/08/10 19:29:31 UTC
[13/13] incubator-usergrid git commit: Merge branch 'two-dot-o-dev'
of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
USERGRID-903
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-903
# By Todd Nine (7) and Michael Russo (1)
# Via Shawn Feldman (2) and others
* 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Fixes incorrect ack
Fixes jackson issue with long fields and serialization that is broken in 2.6.0
Added tests to check for resume functionality
Fixes fat finger
Upgrades Jackson to fix this issue.
Fixes runtime bug with joda time conflict with Astayanx
Invalidate the migration info cache after resetting the version.
Updates amazon async service wiring to wire to event builder
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4d75b6b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4d75b6b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4d75b6b1
Branch: refs/heads/USERGRID-903
Commit: 4d75b6b108c6fc28e943983597043c8ba5ddb4a5
Parents: 0a78e15 cce5fa5
Author: GERey <gr...@apigee.com>
Authored: Wed Aug 5 15:30:16 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Wed Aug 5 15:30:16 2015 -0700
----------------------------------------------------------------------
.../asyncevents/AmazonAsyncEventService.java | 259 +++++-----
.../asyncevents/AsyncIndexProvider.java | 11 +-
.../asyncevents/EventBuilder.java | 11 +-
.../asyncevents/EventBuilderImpl.java | 21 +-
.../asyncevents/InMemoryAsyncEventService.java | 14 +-
.../asyncevents/model/AsyncEvent.java | 153 +-----
.../asyncevents/model/EdgeDeleteEvent.java | 36 +-
.../asyncevents/model/EdgeIndexEvent.java | 39 +-
.../asyncevents/model/EntityDeleteEvent.java | 18 +-
.../asyncevents/model/EntityIndexEvent.java | 30 +-
.../model/InitializeApplicationIndexEvent.java | 21 +-
.../index/AmazonAsyncEventServiceTest.java | 8 +-
.../index/AsyncIndexServiceTest.java | 14 +-
.../PerformanceEntityRebuildIndexTest.java | 385 --------------
.../usergrid/persistence/RebuildIndexTest.java | 515 +++++++++++++++++++
.../data/DataMigrationManagerImpl.java | 1 +
stack/corepersistence/pom.xml | 1 -
.../index/IndexLocationStrategy.java | 4 +-
stack/corepersistence/queue/pom.xml | 20 +-
.../queue/util/AmazonNotificationUtils.java | 230 +++++----
20 files changed, 966 insertions(+), 825 deletions(-)
----------------------------------------------------------------------