You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/07/27 15:45:45 UTC
[11/11] incubator-usergrid git commit: Merge branch 'two-dot-o-dev'
into USERGRID-869
Merge branch 'two-dot-o-dev' into USERGRID-869
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c4312eff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c4312eff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c4312eff
Branch: refs/heads/two-dot-o-dev
Commit: c4312eff3e8e411482be73afd48f2ae49620f031
Parents: 939b726 17b1abc
Author: Shawn Feldman <sf...@apache.org>
Authored: Sun Jul 26 19:03:00 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Sun Jul 26 19:03:00 2015 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 9 +-
.../asyncevents/AmazonAsyncEventService.java | 51 +++--
.../index/IndexProcessorFig.java | 7 +-
.../corepersistence/util/CpEntityMapUtils.java | 190 ++++++++++---------
.../org/apache/usergrid/persistence/Query.java | 2 +
.../persistence/entities/Notification.java | 106 +++++++++--
.../persistence/core/rx/OrderedMergeTest.java | 57 ++++--
stack/corepersistence/model/pom.xml | 7 +
.../persistence/model/field/FieldTypeName.java | 1 +
.../model/field/SerializedObjectField.java | 51 +++++
.../index/impl/EsIndexBufferConsumerImpl.java | 16 +-
stack/pom.xml | 1 +
.../notifications/NotificationsService.java | 45 ++---
13 files changed, 359 insertions(+), 184 deletions(-)
----------------------------------------------------------------------