usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [15/52] [abbrv] usergrid git commit: Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/asf/usergrid into release-2.1.1
Date Mon, 23 May 2016 14:16:58 GMT
Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/asf/usergrid into release-2.1.1

# Conflicts:
#	stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/666c49e0
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/666c49e0
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/666c49e0

Branch: refs/heads/asf-site
Commit: 666c49e09e09a88137d6215447f46088907bb01c
Parents: d8371e1 b8f502f
Author: Dave Johnson <snoopdave@apache.org>
Authored: Mon Apr 18 08:43:14 2016 -0400
Committer: Dave Johnson <snoopdave@apache.org>
Committed: Mon Apr 18 08:43:14 2016 -0400

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        |  55 ++--
 .../corepersistence/CpRelationManager.java      | 103 ++++++-
 .../pipeline/builder/IdBuilder.java             |   6 +
 .../pipeline/read/FilterFactory.java            |   8 +-
 .../pipeline/read/traverse/IdFilter.java        |  52 ++++
 .../results/IdQueryExecutor.java                |  66 +++++
 .../service/ApplicationServiceImpl.java         |  37 ++-
 .../service/CollectionSearch.java               |   9 +
 .../service/CollectionService.java              |   5 +
 .../service/CollectionServiceImpl.java          |  23 ++
 .../persistence/MultiQueryIterator.java         |   2 +-
 .../persistence/NotificationGraphIterator.java  | 163 +++++++++++
 .../persistence/PagingResultsIterator.java      |  25 +-
 .../apache/usergrid/persistence/PathQuery.java  |  47 +++-
 .../apache/usergrid/persistence/Results.java    |  20 ++
 .../persistence/entities/Notification.java      |  70 ++++-
 .../index/impl/EsEntityIndexImpl.java           |  16 +-
 .../index/impl/FailureMonitorImpl.java          |   2 +-
 .../IllegalArgumentExceptionMapper.java         |   4 +-
 .../collection/CollectionsResourceIT.java       |   6 +-
 .../notifications/NotificationDeviceFilter.java |  45 +++
 .../notifications/NotificationsService.java     |  32 ++-
 .../impl/ApplicationQueueManagerImpl.java       | 273 +++++++++++--------
 .../gcm/NotificationsServiceIT.java             |   2 +-
 24 files changed, 875 insertions(+), 196 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/666c49e0/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
----------------------------------------------------------------------


Mime
View raw message