usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [58/58] [abbrv] git commit: Merge branch 'two-dot-o' into loadtest
Date Tue, 21 Oct 2014 17:40:58 GMT
Merge branch 'two-dot-o' into loadtest


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

Branch: refs/heads/loadtest
Commit: 6614b6e78c863b1acedd746003818749afb99ca8
Parents: 702f468 926ae56
Author: Todd Nine <toddnine@apache.org>
Authored: Tue Oct 21 11:38:35 2014 -0600
Committer: Todd Nine <toddnine@apache.org>
Committed: Tue Oct 21 11:38:35 2014 -0600

----------------------------------------------------------------------
 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 ++++-
 .../main/resources/usergrid-default.properties  |    2 +-
 stack/core/pom.xml                              |   21 -
 .../corepersistence/CpEntityManager.java        |  109 +-
 .../corepersistence/CpEntityManagerFactory.java |   40 +-
 .../corepersistence/CpRelationManager.java      | 1425 ++++++++----------
 .../usergrid/corepersistence/CpSetup.java       |    3 +
 .../usergrid/corepersistence/CpVisitor.java     |   11 +-
 .../usergrid/corepersistence/CpWalker.java      |  155 +-
 .../apache/usergrid/metrics/MetricsFactory.java |   21 +-
 .../usergrid/persistence/EntityManager.java     |    2 +-
 .../persistence/EntityManagerFactory.java       |    8 +-
 .../org/apache/usergrid/CoreApplication.java    |    1 -
 .../PerformanceEntityRebuildIndexTest.java      |   38 +-
 stack/corepersistence/common/pom.xml            |   13 +-
 stack/corepersistence/pom.xml                   |    1 +
 .../index/impl/EsEntityIndexImpl.java           |  146 +-
 .../persistence/index/impl/EsProvider.java      |   21 +-
 stack/corepersistence/queue/pom.xml             |    8 +-
 .../queue/impl/SQSQueueManagerImpl.java         |   11 +-
 stack/pom.xml                                   |   29 +-
 .../apache/usergrid/rest/SystemResource.java    |   50 +-
 stack/rest/src/main/webapp/WEB-INF/web.xml      |    2 +-
 .../usergrid/rest/management/AccessTokenIT.java |  381 ++---
 .../services/devices/DevicesService.java        |   55 +-
 .../notifications/NotificationsService.java     |    7 +-
 .../services/users/devices/DevicesService.java  |   33 +
 .../AbstractServiceNotificationIT.java          |   10 +-
 .../apns/NotificationsServiceIT.java            |  176 +--
 .../gcm/NotificationsServiceIT.java             |  164 +-
 49 files changed, 1999 insertions(+), 2207 deletions(-)
----------------------------------------------------------------------



Mime
View raw message