You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/12/15 19:32:24 UTC
[40/50] incubator-usergrid git commit: Merge branch 'two-dot-o' into
two-dot-o-events
Merge branch 'two-dot-o' into two-dot-o-events
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/88d49cb8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/88d49cb8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/88d49cb8
Branch: refs/heads/two-dot-o
Commit: 88d49cb8d7123276db0a4dabb78061f4465b0ccf
Parents: 5f0dc34 ce20abe
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Nov 25 11:24:00 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Nov 25 11:24:00 2014 -0500
----------------------------------------------------------------------
.../org/apache/usergrid/CoreApplication.java | 17 +-
.../migration/EntityDataMigrationIT.java | 16 +-
.../migration/EntityTypeMappingMigrationIT.java | 17 +
.../migration/GraphShardVersionMigrationIT.java | 20 +-
.../migration/MigrationTestRule.java | 101 ++++
.../org/apache/usergrid/persistence/GeoIT.java | 579 ++++++++++---------
.../applications/queries/BasicGeoTests.java | 268 +++++++++
.../applications/queries/basicGeoTests.java | 184 ------
8 files changed, 728 insertions(+), 474 deletions(-)
----------------------------------------------------------------------