usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [50/50] [abbrv] git commit: Merge branch 'two-dot-o' into two-dot-o-events
Date Mon, 20 Oct 2014 13:47:18 GMT
Merge branch 'two-dot-o' into two-dot-o-events

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java


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

Branch: refs/heads/two-dot-o-events
Commit: 3551f3c6331e7edafc871727d0f1bdeeb2c7cb39
Parents: d9ace9e ee0f28c
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Mon Oct 20 09:46:03 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Mon Oct 20 09:46:03 2014 -0400

----------------------------------------------------------------------
 stack/awscluster/pom.xml                        |    2 +-
 stack/awscluster/src/main/cql/create_locks.cql  |   24 +-
 .../awscluster/src/main/cql/create_usergrid.cql |   80 +-
 .../main/cql/create_usergrid_applications.cql   |  411 +----
 .../main/dist/init_instance/create_keyspaces.sh |   28 +-
 .../src/main/dist/init_instance/create_raid0.sh |   19 +-
 .../dist/init_instance/create_raid0_2disks.sh   |   54 -
 .../src/main/dist/init_instance/init_cass.sh    |   70 -
 .../main/dist/init_instance/init_db_server.sh   |   11 +-
 .../main/dist/init_instance/init_es_server.sh   |   67 +
 .../dist/init_instance/init_graphite_server.sh  |   11 +-
 .../main/dist/init_instance/init_rest_server.sh |   24 +
 .../dist/init_instance/install_cassandra.sh     |    6 +-
 .../dist/init_instance/install_elasticsearch.sh |   22 +-
 .../init_instance/install_opscenter_agent.sh    |    1 +
 .../main/dist/init_instance/install_yourkit.sh  |    6 +-
 .../src/main/groovy/configure_cassandra.groovy  |   26 +-
 .../main/groovy/configure_elasticsearch.groovy  |   26 +-
 .../src/main/groovy/configure_usergrid.groovy   |   22 +-
 .../src/main/groovy/tag_instance.groovy         |   10 +-
 stack/awscluster/ugcluster-cf.json              |  345 ++++-
 stack/core/pom.xml                              |   21 -
 .../corepersistence/CpEntityManager.java        |  213 +--
 .../corepersistence/CpEntityManagerFactory.java |   73 +-
 .../corepersistence/CpRelationManager.java      | 1434 ++++++++----------
 .../usergrid/corepersistence/CpSetup.java       |    3 +
 .../usergrid/corepersistence/CpVisitor.java     |   15 +-
 .../usergrid/corepersistence/CpWalker.java      |  242 +--
 .../HybridEntityManagerFactory.java             |   10 -
 .../corepersistence/results/EntityVerifier.java |    3 +-
 .../results/FilteringLoader.java                |   74 +-
 .../corepersistence/results/ResultsLoader.java  |   11 +-
 .../results/VersionVerifier.java                |    5 +-
 .../apache/usergrid/metrics/MetricsFactory.java |   21 +-
 .../usergrid/persistence/EntityManager.java     |    5 +-
 .../persistence/EntityManagerFactory.java       |   12 +-
 .../cassandra/EntityManagerFactoryImpl.java     |   10 -
 .../cassandra/EntityManagerImpl.java            |    7 +-
 .../org/apache/usergrid/CoreApplication.java    |    1 -
 .../usergrid/batch/job/SchedulerRuntime8IT.java |    3 +
 .../corepersistence/StaleIndexCleanupTest.java  |    2 +
 .../PerformanceEntityRebuildIndexTest.java      |   36 +-
 .../PerformanceEntityRepersistTest.java         |  240 ---
 .../query/AbstractIteratingQueryIT.java         |    3 +
 .../impl/EntityCollectionManagerImpl.java       |   37 +-
 .../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 +-
 stack/corepersistence/common/pom.xml            |   13 +-
 stack/corepersistence/pom.xml                   |    1 +
 .../index/impl/EsEntityIndexBatchImpl.java      |    2 +-
 .../index/impl/EsEntityIndexImpl.java           |  146 +-
 .../persistence/index/impl/EsProvider.java      |   21 +-
 .../persistence/index/impl/IndexScopeImpl.java  |   37 +
 stack/corepersistence/queue/pom.xml             |    8 +-
 .../queue/impl/SQSQueueManagerImpl.java         |   21 +-
 stack/pom.xml                                   |   31 +-
 .../apache/usergrid/rest/SystemResource.java    |   74 +-
 stack/rest/src/main/webapp/WEB-INF/web.xml      |    2 +-
 .../usergrid/rest/management/AccessTokenIT.java |  381 ++---
 .../usergrid/services/ServiceManager.java       |    7 +-
 .../services/devices/DevicesService.java        |   55 +-
 .../notifications/ApplicationQueueManager.java  |    5 +-
 .../notifications/NotificationsService.java     |    9 +-
 .../services/notifications/QueueListener.java   |    2 +-
 .../services/users/devices/DevicesService.java  |   33 +
 .../cassandra/ManagementServiceIT.java          |    2 +-
 .../usergrid/services/TestQueueManager.java     |    4 +-
 .../AbstractServiceNotificationIT.java          |   10 +-
 .../notifications/NotifiersServiceIT.java       |    1 +
 .../apns/NotificationsServiceIT.java            |  176 +--
 .../gcm/NotificationsServiceIT.java             |  164 +-
 .../src/test/resources/log4j.properties         |    4 +
 .../org/apache/usergrid/tools/RepersistAll.java |   98 --
 78 files changed, 2407 insertions(+), 2868 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3551f3c6/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3551f3c6/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
----------------------------------------------------------------------


Mime
View raw message