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/02/21 14:40:24 UTC

[09/18] incubator-usergrid git commit: Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273

Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273


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

Branch: refs/heads/USERGRID-273-indexbuffer
Commit: 399d60e773f49e91dabe5caaa4e8e7ee218aea8c
Parents: 2ec6407 d87577e
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Feb 18 11:18:19 2015 -0800
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Feb 18 11:18:19 2015 -0800

----------------------------------------------------------------------
 .../src/main/groovy/configure_usergrid.groovy   |  2 +-
 .../entities/FailedImportEntity.java            | 11 +---
 .../datagenerators/EntityDataGenerator.scala    | 17 +++---
 .../datagenerators/FeederGenerator.scala        | 24 ++++++++-
 .../usergrid/scenarios/EntityScenarios.scala    | 20 ++++---
 .../org/apache/usergrid/settings/Settings.scala |  2 +
 .../PostCustomEntitySimulation.scala            | 27 ++++++++--
 stack/mongo-emulator/pom.xml                    | 15 +-----
 stack/pom.xml                                   | 47 ++++-------------
 .../rest/management/OrganizationsIT.java        |  2 +-
 .../management/importer/ImportServiceImpl.java  |  5 +-
 .../usergrid/management/OrganizationIT.java     | 30 +++++------
 .../importer/FileImportTrackerTest.java         | 55 ++++++++------------
 .../management/importer/ImportCollectionIT.java | 49 ++++++++++-------
 .../services/ApplicationsServiceIT.java         |  8 +--
 .../usergrid/cassandra/ClearShiroSubject.java   | 18 +++++++
 16 files changed, 176 insertions(+), 156 deletions(-)
----------------------------------------------------------------------