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 2014/11/24 17:11:02 UTC
[5/5] incubator-usergrid git commit: Merge branch 'two-dot-o' into
index-alias
Merge branch 'two-dot-o' into index-alias
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/486c0d25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/486c0d25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/486c0d25
Branch: refs/heads/index-alias
Commit: 486c0d2512153c0ffea57674216b63eb228d2317
Parents: 30b3817 2586e9f
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Nov 24 09:10:23 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Nov 24 09:10:23 2014 -0700
----------------------------------------------------------------------
.../corepersistence/util/CpEntityMapUtils.java | 62 ++++---
.../org/apache/usergrid/CoreApplication.java | 17 +-
.../migration/EntityDataMigrationIT.java | 15 +-
.../migration/EntityTypeMappingMigrationIT.java | 17 ++
.../migration/GraphShardVersionMigrationIT.java | 18 +-
.../migration/MigrationTestRule.java | 101 ++++++++++
.../persistence/model/field/LocationField.java | 3 -
.../index/impl/EntityIndexMapUtils.java | 4 +-
.../collection/groups/GroupResourceIT.java | 182 +-----------------
.../applications/queries/GeoPagingTest.java | 41 +++--
.../applications/queries/basicGeoTests.java | 184 +++++++++++++++++++
11 files changed, 406 insertions(+), 238 deletions(-)
----------------------------------------------------------------------