Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
# By Todd Nine # Via Todd Nine * 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: Fixed invalid tests Refactored naming utilities into their own class to aid in refactoring Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a143ddfe Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a143ddfe Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a143ddfe Branch: refs/heads/two-dot-o Commit: a143ddfea14fa4a3dfe171ff25be949e92de767f Parents: 466f939 f448704 Author: grey <[email protected]> Authored: Wed Nov 12 13:56:45 2014 -0800 Committer: grey <[email protected]> Committed: Wed Nov 12 13:56:45 2014 -0800 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 2 +- .../corepersistence/CpEntityManagerFactory.java | 73 ++++-------- .../corepersistence/CpRelationManager.java | 4 +- .../usergrid/corepersistence/CpSetup.java | 2 +- .../usergrid/corepersistence/CpWalker.java | 9 +- .../HybridEntityManagerFactory.java | 2 +- .../usergrid/corepersistence/NamingUtils.java | 70 +++++++++++ .../migration/GraphShardVersionMigration.java | 84 ++++++++++++- .../rx/ApplicationObservable.java | 119 +++++++++++++++++++ .../rx/EdgesFromSourceObservable.java | 82 +++++++++++++ .../corepersistence/rx/TargetIdObservable.java | 75 ++++++++++++ .../usergrid/persistence/CollectionIT.java | 3 +- .../persistence/EntityConnectionsIT.java | 43 +++---- .../PerformanceEntityRebuildIndexTest.java | 6 +- 14 files changed, 478 insertions(+), 96 deletions(-) ----------------------------------------------------------------------
