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/25 01:21:11 UTC
[4/5] incubator-usergrid git commit: Merge branch 'USERGRID-878' into
two-dot-o-dev
Merge branch 'USERGRID-878' into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6875807b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6875807b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6875807b
Branch: refs/heads/two-dot-o-dev
Commit: 6875807bc47798a4f7cd2cd7a814ab4b1251214d
Parents: 5308b08 af6dbcb
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Jul 24 17:20:21 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Jul 24 17:20:21 2015 -0600
----------------------------------------------------------------------
.../corepersistence/util/CpEntityMapUtils.java | 181 ++++++++++---------
.../persistence/entities/Notification.java | 106 +++++++++--
.../persistence/core/rx/OrderedMergeTest.java | 57 ++++--
.../index/impl/EsIndexBufferConsumerImpl.java | 16 +-
.../notifications/NotificationsService.java | 45 ++---
5 files changed, 252 insertions(+), 153 deletions(-)
----------------------------------------------------------------------