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/09/18 21:01:04 UTC
[8/8] usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1022
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1022
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/48391ac0
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/48391ac0
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/48391ac0
Branch: refs/heads/USERGRID-1022
Commit: 48391ac078ecf5ec3d2b42af424c4b3b234dc822
Parents: e28be8f 327ccc6
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Sep 18 15:00:45 2015 -0400
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Sep 18 15:00:45 2015 -0400
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 51 +++++--
.../migration/CoreMigration.java | 45 ++----
.../migration/CoreMigrationPlugin.java | 38 +++--
.../migration/DeDupConnectionDataMigration.java | 93 ++++++++++++
.../migration/EntityTypeMappingMigration.java | 104 -------------
.../migration/MigrationModuleVersionPlugin.java | 5 -
.../corepersistence/migration/Versions.java | 31 ----
.../DeDupConnectionDataMigrationTest.java | 145 +++++++++++++++++++
.../migration/EntityTypeMappingMigrationIT.java | 125 ----------------
.../serialization/impl/SerializationModule.java | 4 +-
.../migration/CollectionMigrationPlugin.java | 8 +-
.../migration/MvccEntityDataMigrationImpl.java | 10 +-
...ctMvccEntityDataMigrationV1ToV3ImplTest.java | 39 +++--
.../core/astyanax/MultiRowColumnIterator.java | 2 +-
.../migration/data/AbstractMigrationPlugin.java | 17 +--
.../core/migration/data/DataMigration.java | 11 +-
.../migration/data/MigrationDataProvider.java | 2 +-
.../core/migration/data/MigrationPlugin.java | 4 +-
.../migration/data/TestProgressObserver.java | 10 +-
.../persistence/graph/guice/GraphModule.java | 4 +-
.../impl/migration/EdgeDataMigrationImpl.java | 12 +-
.../impl/migration/GraphMigrationPlugin.java | 8 +-
.../persistence/graph/GraphManagerIT.java | 6 +-
.../migration/EdgeDataMigrationImplTest.java | 59 ++++----
.../persistence/index/guice/IndexModule.java | 4 +-
.../index/migration/EsIndexMigrationPlugin.java | 8 +-
26 files changed, 418 insertions(+), 427 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/48391ac0/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/48391ac0/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/guice/IndexModule.java
----------------------------------------------------------------------