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/10/01 18:28:06 UTC

[31/36] usergrid git commit: Merge commit 'refs/pull/391/head' of github.com:apache/usergrid into 2.1-release

Merge commit 'refs/pull/391/head' of github.com:apache/usergrid into 2.1-release


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

Branch: refs/heads/master
Commit: 6626b83e35fda96d2601581affcf2b920df7a322
Parents: 4e98ed7 c19adb8
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Sep 29 10:09:14 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Sep 29 10:09:14 2015 -0600

----------------------------------------------------------------------
 .../corepersistence/CpManagerCache.java         |  12 +-
 .../corepersistence/CpRelationManager.java      |   4 +-
 .../usergrid/corepersistence/ManagerCache.java  |   7 +
 .../asyncevents/AmazonAsyncEventService.java    | 151 +++++++++++++------
 .../asyncevents/AsyncIndexProvider.java         |  12 +-
 .../asyncevents/InMemoryAsyncEventService.java  |  26 +++-
 .../corepersistence/index/IndexServiceImpl.java |   8 +-
 .../read/search/CandidateEntityFilter.java      |  16 +-
 .../pipeline/read/search/CandidateIdFilter.java |  16 +-
 .../index/AmazonAsyncEventServiceTest.java      |   5 +-
 .../index/InMemoryAsycIndexServiceTest.java     |   5 +-
 .../corepersistence/index/IndexServiceTest.java |  18 ++-
 .../persistence/index/EntityIndexBatch.java     |   7 +-
 .../index/impl/EsEntityIndexBatchImpl.java      |   8 +-
 .../index/impl/EsEntityIndexFactoryImpl.java    |   4 -
 .../index/impl/EsEntityIndexImpl.java           |   5 +-
 .../index/impl/IndexOperationMessage.java       |   7 +
 .../index/impl/IndexRefreshCommandImpl.java     |   2 +-
 .../persistence/index/impl/EntityIndexTest.java |  48 +++---
 .../persistence/index/impl/GeoPagingTest.java   |   4 +-
 .../index/impl/IndexLoadTestsIT.java            |   5 +-
 .../exceptions/AbstractExceptionMapper.java     |   2 +-
 22 files changed, 254 insertions(+), 118 deletions(-)
----------------------------------------------------------------------