usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [41/50] [abbrv] incubator-usergrid git commit: Merge branch 'USERGRID-608' into two-dot-o-dev
Date Thu, 28 May 2015 12:53:46 GMT
Merge branch 'USERGRID-608' 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/5a889039
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5a889039
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5a889039

Branch: refs/heads/USERGRID-669
Commit: 5a88903994c8bdbfffeafe57fb2d5e3c7b6bcc8c
Parents: 1396ebe 4f1b4be
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Wed May 27 11:28:24 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Wed May 27 11:28:24 2015 -0600

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        |  94 ++++++---
 .../corepersistence/CpEntityManagerFactory.java |  35 +++-
 .../asyncevents/EventBuilderImpl.java           |  23 ++-
 .../asyncevents/InMemoryAsyncEventService.java  |   1 -
 .../corepersistence/index/IndexService.java     |   5 +-
 .../corepersistence/index/IndexServiceImpl.java |  86 +++++++-
 .../corepersistence/index/ReIndexService.java   |   4 +-
 .../index/ReIndexServiceImpl.java               |   2 +-
 .../corepersistence/index/IndexServiceTest.java | 202 ++++++++++++++++++-
 .../apache/usergrid/persistence/CounterIT.java  |   6 +
 .../usergrid/persistence/EntityManagerIT.java   |  67 +++---
 .../cassandra/EntityManagerFactoryImplIT.java   |  30 ++-
 .../mvcc/stage/delete/UniqueCleanup.java        |  18 +-
 .../index/ApplicationEntityIndex.java           |  23 +++
 .../persistence/index/CandidateResults.java     |   4 +-
 .../SearchRequestBuilderStrategyV2.java         |  69 +++++++
 .../usergrid/persistence/index/IndexEdge.java   |   6 +
 .../impl/EsApplicationEntityIndexImpl.java      | 191 +++++++++++++++++-
 .../index/impl/EsIndexBufferConsumerImpl.java   |   5 +-
 .../persistence/index/impl/EntityIndexTest.java |  55 ++++-
 20 files changed, 809 insertions(+), 117 deletions(-)
----------------------------------------------------------------------



Mime
View raw message