usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [3/6] usergrid git commit: Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/usergrid into two-dot-o-dev
Date Tue, 01 Sep 2015 15:39:19 GMT
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/usergrid into two-dot-o-dev


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

Branch: refs/heads/two-dot-o-dev
Commit: d5d5a651754f7cfbd40d564c4f105ee5eadaab47
Parents: 8156353 b1d762e
Author: Dave Johnson <snoopdave@apache.org>
Authored: Tue Sep 1 11:20:25 2015 -0400
Committer: Dave Johnson <snoopdave@apache.org>
Committed: Tue Sep 1 11:20:25 2015 -0400

----------------------------------------------------------------------
 portal/js/global/page-controller.js             |  3 +-
 portal/js/global/ug-service.js                  |  2 +-
 portal/js/login/login-controller.js             |  5 ++
 stack/awscluster/gatling-cluster-cf.json        |  2 +-
 .../corepersistence/CpEntityManager.java        | 11 +--
 .../results/EntityQueryExecutor.java            |  3 +-
 .../service/AggregationService.java             | 17 ++++
 .../service/AggregationServiceImpl.java         | 28 ++++++-
 .../usergrid/persistence/AbstractEntity.java    | 21 +++--
 .../org/apache/usergrid/persistence/Entity.java |  6 +-
 .../corepersistence/AggregationServiceTest.java |  4 +
 .../corepersistence/StaleIndexCleanupTest.java  | 13 +--
 .../usergrid/persistence/EntityManagerIT.java   |  8 +-
 .../apache/usergrid/persistence/EntityTest.java |  2 +-
 .../apache/usergrid/persistence/IndexIT.java    |  6 +-
 .../cassandra/EntityManagerFactoryImplIT.java   |  2 +-
 .../apache/usergrid/utils/IndexUtilsTest.java   |  2 +-
 .../persistence/model/entity/Entity.java        | 10 +--
 .../model/entity/MapToEntityConverter.java      |  5 +-
 .../model/field/value/EntityObject.java         | 10 +++
 .../queue/impl/SNSQueueManagerImpl.java         | 76 +++++++----------
 stack/loadtests/README.md                       | 10 +--
 stack/loadtests/runOrgAppSetup.sh               | 88 ++++++++++++++++++++
 stack/loadtests/runRandomEntityByNameTest.sh    |  4 +-
 stack/loadtests/runRandomEntityByUuidTest.sh    |  6 +-
 .../usergrid/enums/ConfigProperties.scala       |  8 +-
 .../apache/usergrid/enums/ScenarioType.scala    |  3 +-
 .../scenarios/EntityCollectionScenarios.scala   |  6 ++
 .../org/apache/usergrid/settings/Settings.scala | 22 +++++
 .../simulations/ConfigurableSimulation.scala    |  1 +
 stack/loadtests/testConfig.sh                   |  1 +
 stack/pom.xml                                   |  1 +
 .../collection/users/UserResourceIT.java        |  2 +-
 33 files changed, 286 insertions(+), 102 deletions(-)
----------------------------------------------------------------------



Mime
View raw message