usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [1/2] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-903
Date Mon, 10 Aug 2015 17:28:59 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/UESRGRID-904 [created] 4a6c544a6


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/UESRGRID-904
Commit: 4d75b6b108c6fc28e943983597043c8ba5ddb4a5
Parents: 0a78e15 cce5fa5
Author: GERey <greyes@apigee.com>
Authored: Wed Aug 5 15:30:16 2015 -0700
Committer: GERey <greyes@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(-)
----------------------------------------------------------------------



Mime
View raw message