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/73a3bcca Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/73a3bcca Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/73a3bcca Branch: refs/heads/two-dot-o-events Commit: 73a3bcca80923978ad643e331d84a0a26e1e691f Parents: 717eb15 00eb339 Author: Todd Nine <[email protected]> Authored: Tue Nov 18 16:45:50 2014 -0700 Committer: Todd Nine <[email protected]> Committed: Tue Nov 18 16:45:50 2014 -0700 ---------------------------------------------------------------------- .../src/test/resources/usergrid-test.properties | 5 + .../corepersistence/CpEntityManager.java | 11 +- .../migration/EntityTypeMappingMigrationIT.java | 9 +- .../migration/GraphShardVersionMigrationIT.java | 12 +- .../usergrid/persistence/CollectionIT.java | 188 +++++-------------- .../persistence/PerformanceEntityWriteTest.java | 2 +- .../exception/DataCorruptionException.java | 32 ++++ .../MvccEntitySerializationStrategyImpl.java | 43 ++++- .../graph/GraphManagerShardConsistencyIT.java | 2 +- stack/corepersistence/pom.xml | 2 +- .../impl/EntityConnectionIndexImplTest.java | 2 + .../persistence/index/impl/EntityIndexTest.java | 1 + .../src/test/resources/usergrid-UNIT.properties | 6 + .../IllegalArgumentExceptionMapper.java | 8 + .../exceptions/ManagementExceptionMapper.java | 13 +- .../rest/exceptions/ThrowableMapper.java | 12 ++ .../rest/test/resource/OrgUserUUIDWrapper.java | 19 +- .../rest/test/resource/TestOrganization.java | 16 ++ .../usergrid/cassandra/CassandraResource.java | 2 + 19 files changed, 205 insertions(+), 180 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/73a3bcca/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java ----------------------------------------------------------------------
