Merge branch 'two-dot-o-dev' into usergrid-103-upgrade-jersey
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ed053ede Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ed053ede Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ed053ede Branch: refs/heads/two-dot-o-dev Commit: ed053edef8f0d2066e984043cdc0a6682ebb96b3 Parents: d4e8be8 723ee3a Author: Dave Johnson <[email protected]> Authored: Tue Sep 15 08:16:28 2015 -0400 Committer: Dave Johnson <[email protected]> Committed: Tue Sep 15 08:16:28 2015 -0400 ---------------------------------------------------------------------- .../rx/impl/AllApplicationsObservableImpl.java | 36 +++----- .../corepersistence/CpEntityMapUtilsTest.java | 4 +- .../org/apache/usergrid/persistence/GeoIT.java | 52 ++++++++++- .../migration/MvccEntityDataMigrationImpl.java | 94 +++++++++++--------- .../model/entity/MapToEntityConverter.java | 8 +- 5 files changed, 119 insertions(+), 75 deletions(-) ----------------------------------------------------------------------
