usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [06/19] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-643
Date Fri, 22 May 2015 00:22:04 GMT
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
into USERGRID-643


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

Branch: refs/heads/USERGRID-641
Commit: a767bb61e68525006202a447717e6592f0dc0c8e
Parents: 20c9b35 5b1dfa1
Author: Todd Nine <tnine@apigee.com>
Authored: Thu May 14 17:19:41 2015 -0600
Committer: Todd Nine <tnine@apigee.com>
Committed: Thu May 14 17:19:41 2015 -0600

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        | 22 ++---
 .../corepersistence/CpEntityManagerFactory.java |  8 +-
 .../corepersistence/CpRelationManager.java      | 90 ++++++++++----------
 .../corepersistence/index/IndexServiceImpl.java |  6 +-
 .../usergrid/persistence/EntityManager.java     | 34 ++++----
 .../persistence/MultiQueryIterator.java         |  4 +-
 .../apache/usergrid/persistence/PathQuery.java  |  3 +-
 .../usergrid/persistence/RelationManager.java   | 12 +--
 .../usergrid/persistence/CollectionIT.java      |  2 +-
 .../usergrid/persistence/CountingMutatorIT.java |  6 +-
 .../persistence/EntityConnectionsIT.java        | 26 +++---
 .../org/apache/usergrid/persistence/GeoIT.java  |  8 +-
 .../PerformanceEntityRebuildIndexTest.java      |  8 +-
 .../persistence/query/ConnectionHelper.java     |  2 +-
 .../persistence/query/IteratingQueryIT.java     |  2 +-
 .../resources/usergrid-custom-test.properties   |  2 +
 .../persistence/index/impl/IndexingUtils.java   |  2 +-
 .../org/apache/usergrid/rest/ApiResponse.java   | 16 ++++
 .../apache/usergrid/rest/ApiResponseTest.java   | 45 ++++++++++
 .../rest/management/ImportResourceIT.java       |  2 +-
 .../cassandra/ManagementServiceImpl.java        | 23 ++---
 .../management/export/ExportServiceImpl.java    |  4 +-
 .../management/importer/FileImportJob.java      |  5 +-
 .../management/importer/ImportServiceImpl.java  | 15 ++--
 .../services/AbstractConnectionsService.java    | 24 +++---
 .../users/activities/ActivitiesService.java     |  4 +-
 .../users/activities/ActivitiesService.java     |  4 +-
 .../apache/usergrid/management/EmailFlowIT.java |  9 +-
 .../management/importer/ImportCollectionIT.java |  2 +-
 .../importer/ImportConnectionsTest.java         |  9 +-
 .../management/importer/ImportServiceIT.java    |  6 +-
 31 files changed, 224 insertions(+), 181 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a767bb61/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
----------------------------------------------------------------------


Mime
View raw message