You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/17 18:35:01 UTC
[14/49] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into cloudformation-update
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into cloudformation-update
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7f731fb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7f731fb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7f731fb0
Branch: refs/heads/two-dot-o
Commit: 7f731fb013864956259b6f01c353e8eea34fe35c
Parents: 83fccdd 5d0ad62
Author: amuramoto <am...@apigee.com>
Authored: Fri Oct 10 17:38:08 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Fri Oct 10 17:38:08 2014 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 121 +++-------
.../corepersistence/CpEntityManagerFactory.java | 22 --
.../corepersistence/CpRelationManager.java | 3 +-
.../usergrid/corepersistence/CpVisitor.java | 8 +-
.../usergrid/corepersistence/CpWalker.java | 149 +++---------
.../HybridEntityManagerFactory.java | 10 -
.../corepersistence/results/EntityVerifier.java | 3 +-
.../results/FilteringLoader.java | 23 +-
.../results/VersionVerifier.java | 5 +-
.../usergrid/persistence/EntityManager.java | 3 -
.../persistence/EntityManagerFactory.java | 4 -
.../cassandra/EntityManagerFactoryImpl.java | 10 -
.../cassandra/EntityManagerImpl.java | 7 +-
.../usergrid/batch/job/SchedulerRuntime8IT.java | 3 +
.../PerformanceEntityRepersistTest.java | 236 -------------------
.../impl/EntityCollectionManagerImpl.java | 36 +--
.../mvcc/stage/write/WriteCommit.java | 2 +-
.../collection/mvcc/stage/write/WriteStart.java | 7 +-
.../serialization/impl/FieldSerializer.java | 3 +-
.../MvccEntitySerializationStrategyImpl.java | 2 +-
.../UniqueValueSerializationStrategyImpl.java | 6 +-
.../collection/EntityCollectionManagerIT.java | 139 +++++++++--
...niqueValueSerializationStrategyImplTest.java | 63 ++++-
.../index/impl/EsEntityIndexBatchImpl.java | 2 +-
stack/pom.xml | 4 +-
.../apache/usergrid/rest/SystemResource.java | 30 ++-
.../cassandra/ManagementServiceIT.java | 2 +-
.../src/test/resources/log4j.properties | 4 +
.../org/apache/usergrid/tools/RepersistAll.java | 98 --------
29 files changed, 327 insertions(+), 678 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7f731fb0/stack/pom.xml
----------------------------------------------------------------------