Merge branch 'release' of https://git-wip-us.apache.org/repos/asf/usergrid into release
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/46fb9265 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/46fb9265 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/46fb9265 Branch: refs/heads/master Commit: 46fb92652b60b7e58f7cc2145042485cbb411189 Parents: 7689f77 62ad5a8 Author: Dave Johnson <[email protected]> Authored: Fri Jan 22 09:36:34 2016 -0500 Committer: Dave Johnson <[email protected]> Committed: Fri Jan 22 09:36:34 2016 -0500 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 10 +- .../corepersistence/CpEntityManagerFactory.java | 18 ++- .../corepersistence/CpRelationManager.java | 53 ++++--- .../usergrid/corepersistence/CpSetup.java | 14 +- .../read/traverse/AbstractReadGraphFilter.java | 37 ++++- .../persistence/EntityManagerFactory.java | 8 +- .../usergrid/persistence/EntityManagerIT.java | 33 ++++ .../graph/impl/stage/EdgeDeleteRepairImpl.java | 18 +-- .../model/entity/MapToEntityConverter.java | 18 ++- .../persistence/model/field/FieldTypeName.java | 3 +- .../persistence/model/field/NullField.java | 44 ++++++ .../model/entity/MapToEntityConverterTest.java | 142 ++++++++++++++++++ .../persistence/model/field/EntityTest.java | 9 +- .../persistence/index/impl/EntityField.java | 11 ++ .../index/impl/EntityMappingParser.java | 16 +- .../index/impl/EntityToMapConverter.java | 3 +- .../persistence/index/impl/FieldParser.java | 5 +- .../persistence/index/impl/IndexingUtils.java | 1 + .../persistence/index/impl/EntityIndexTest.java | 79 +++++++++- .../index/impl/EntityToMapConverterTest.java | 149 ++++++++++++++----- .../index/impl/IndexLoadTestsIT.java | 6 +- .../management/AppInfoMigrationPlugin.java | 3 +- .../usergrid/management/ManagementService.java | 4 +- .../cassandra/ManagementServiceImpl.java | 12 +- .../migration/AppInfoMigrationPluginTest.java | 2 +- 25 files changed, 564 insertions(+), 134 deletions(-) ----------------------------------------------------------------------
