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/16 20:40:23 UTC
[6/9] usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1018
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1018
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/fb1cf2e9
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fb1cf2e9
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/fb1cf2e9
Branch: refs/heads/USERGRID-1022
Commit: fb1cf2e939fc123b9468df372c80664459ef0b96
Parents: b7a22c2 723ee3a
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Sep 15 17:27:20 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Sep 15 17:27:20 2015 -0600
----------------------------------------------------------------------
.../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(-)
----------------------------------------------------------------------