You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/08/12 23:35:42 UTC
[5/6] incubator-usergrid git commit: Merge remote-tracking branch
'upstream/two-dot-o-dev' into two-dot-o-dev
Merge remote-tracking branch 'upstream/two-dot-o-dev' into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/93fb85af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/93fb85af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/93fb85af
Branch: refs/heads/two-dot-o-dev
Commit: 93fb85afbad6bb7311ae573e3eda60bf51dbcf54
Parents: d3174e6 9f81d7b
Author: Mike Dunker <mi...@calbears.net>
Authored: Wed Aug 12 08:54:25 2015 -0700
Committer: Mike Dunker <mi...@calbears.net>
Committed: Wed Aug 12 08:54:25 2015 -0700
----------------------------------------------------------------------
.../asyncevents/AmazonAsyncEventService.java | 2 -
.../model/InitializeApplicationIndexEvent.java | 15 +-
.../PerformanceEntityRebuildIndexTest.java | 385 --------------
.../usergrid/persistence/RebuildIndexTest.java | 515 +++++++++++++++++++
.../migration/data/DataMigrationManager.java | 12 +-
.../data/DataMigrationManagerImpl.java | 18 +
.../data/DataMigrationManagerImplTest.java | 86 ++++
stack/corepersistence/pom.xml | 2 +-
.../apache/usergrid/rest/MigrateResource.java | 49 +-
9 files changed, 684 insertions(+), 400 deletions(-)
----------------------------------------------------------------------