usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [06/13] incubator-usergrid git commit: Merge commit '0f94609eabc5e563428b51590da93c61b397dd3e' into two-dot-o-dev
Date Mon, 10 Aug 2015 17:29:24 GMT
Merge commit '0f94609eabc5e563428b51590da93c61b397dd3e' into two-dot-o-dev

* commit '0f94609eabc5e563428b51590da93c61b397dd3e':
  Fixes fat finger
  Upgrades Jackson to fix this issue.
  Fixes runtime bug with joda time conflict with Astayanx
  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/9427b4ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9427b4ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9427b4ce

Branch: refs/heads/USERGRID-903
Commit: 9427b4ce47f389e517231b97c09c588f0cbf18f4
Parents: ba5c491 0f94609
Author: GERey <greyes@apigee.com>
Authored: Tue Aug 4 16:34:15 2015 -0700
Committer: GERey <greyes@apigee.com>
Committed: Tue Aug 4 16:34:15 2015 -0700

----------------------------------------------------------------------
 .../asyncevents/AmazonAsyncEventService.java    | 261 ++++++++++---------
 .../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 +-
 stack/corepersistence/pom.xml                   |   3 +-
 .../index/IndexLocationStrategy.java            |   4 +-
 stack/corepersistence/queue/pom.xml             |  20 +-
 .../queue/util/AmazonNotificationUtils.java     | 230 ++++++++--------
 17 files changed, 453 insertions(+), 441 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9427b4ce/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/InMemoryAsyncEventService.java
----------------------------------------------------------------------


Mime
View raw message