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/03/04 23:39:30 UTC
[35/38] incubator-usergrid git commit: Merge remote-tracking branch
'origin/USERGRID-432' into two-dot-o
Merge remote-tracking branch 'origin/USERGRID-432' into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/39c732b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/39c732b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/39c732b6
Branch: refs/heads/USERGRID-432
Commit: 39c732b6a72883c1bfb5c4e8cc1d6553fb3cc902
Parents: ebf6e13 ccc884b
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Mar 4 10:05:20 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Mar 4 10:05:20 2015 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 26 ++++---
.../corepersistence/CpEntityManagerFactory.java | 28 ++++----
.../usergrid/corepersistence/CpWalker.java | 10 ++-
.../persistence/EntityManagerFactory.java | 3 +-
.../cassandra/EntityManagerFactoryImpl.java | 2 +-
.../corepersistence/StaleIndexCleanupTest.java | 34 ++++-----
.../cassandra/EntityManagerFactoryImplIT.java | 56 +++++++++------
.../usergrid/persistence/index/EntityIndex.java | 9 ++-
.../usergrid/persistence/index/IndexFig.java | 2 +-
.../index/IndexOperationMessage.java | 7 +-
.../index/impl/EsEntityIndexImpl.java | 72 ++++++++++++++------
.../index/impl/EsIndexBufferConsumerImpl.java | 27 ++++++--
.../persistence/index/impl/EntityIndexTest.java | 6 +-
stack/pom.xml | 24 ++++---
.../org/apache/usergrid/rest/IndexResource.java | 9 ++-
.../usergrid/rest/JobServiceBoostrap.java | 12 ++++
.../apache/usergrid/rest/AbstractRestIT.java | 8 ++-
.../apache/usergrid/rest/IndexResourceIT.java | 1 +
.../services/notifications/QueueListener.java | 11 ++-
.../resources/usergrid-services-context.xml | 3 +-
.../resources/usergrid-custom-test.properties | 3 +
.../usergrid/cassandra/ClearShiroSubject.java | 19 +++---
22 files changed, 235 insertions(+), 137 deletions(-)
----------------------------------------------------------------------