Merge commit 'refs/pull/584/head' of github.com:apache/usergrid

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

Branch: refs/heads/master
Commit: 1d7785b82a9f6d8deb954d7253995d030a2fda91
Parents: 8cce53c 296a4ee
Author: Mike Dunker <[email protected]>
Authored: Mon Nov 13 11:47:35 2017 -0800
Committer: Mike Dunker <[email protected]>
Committed: Mon Nov 13 11:47:35 2017 -0800

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        |  19 +-
 .../corepersistence/CpRelationManager.java      |  28 +--
 .../asyncevents/AsyncEventService.java          |   6 +-
 .../asyncevents/AsyncEventServiceImpl.java      |  50 +++--
 .../asyncevents/AsyncIndexProvider.java         |  44 ++++-
 .../asyncevents/direct/BufferedQueue.java       |  49 +++++
 .../asyncevents/direct/BufferedQueueNOP.java    |  48 +++++
 .../direct/DirectFirstEventServiceImpl.java     | 193 +++++++++++++++++++
 .../corepersistence/pipeline/Pipeline.java      |   9 +-
 .../pipeline/PipelineContext.java               |  21 +-
 .../pipeline/builder/CandidateBuilder.java      |  13 +-
 .../pipeline/builder/IdBuilder.java             |  10 +-
 .../pipeline/builder/PipelineBuilder.java       |  19 +-
 .../read/search/CandidateEntityFilter.java      |  70 +++++--
 .../service/CollectionSearch.java               |   9 +
 .../service/CollectionServiceImpl.java          |  12 +-
 .../corepersistence/util/CpCollectionUtils.java |  36 +++-
 .../usergrid/persistence/index/EntityIndex.java |   1 -
 .../index/impl/EsEntityIndexImpl.java           |   2 +-
 .../persistence/index/impl/EntityIndexTest.java |   1 +
 .../persistence/queue/LegacyQueueFig.java       |  10 +-
 .../queue/impl/SNSQueueManagerImpl.java         |  10 +-
 .../queue/settings/IndexConsistency.java        |  64 ++++++
 .../queue/settings/QueueIndexingStrategy.java   |  80 ++++++++
 .../rest/interceptors/GZIPInterceptor.java      |  79 ++++++++
 25 files changed, 796 insertions(+), 87 deletions(-)
----------------------------------------------------------------------


Reply via email to