You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/07/14 21:43:08 UTC
[3/3] usergrid git commit: Merge branch 'release-2.1.1'
Merge branch 'release-2.1.1'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/91abfd8d
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/91abfd8d
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/91abfd8d
Branch: refs/heads/master
Commit: 91abfd8d93d5d40ca87b9555744b54b8be01fdeb
Parents: 9e038ef 3b6eb07
Author: Michael Russo <mr...@apigee.com>
Authored: Thu Jul 14 14:43:06 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Thu Jul 14 14:43:06 2016 -0700
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 3 +-
.../corepersistence/CpEntityManager.java | 83 +++++++------
.../corepersistence/CpEntityManagerFactory.java | 8 +-
.../corepersistence/CpRelationManager.java | 19 +--
.../index/CollectionSettings.java | 47 +++++++
.../index/CollectionSettingsCache.java | 48 +++++---
.../index/CollectionSettingsCacheFactory.java | 44 -------
.../index/CollectionSettingsCacheImpl.java | 122 -------------------
.../index/CollectionSettingsFactory.java | 73 +++++++++++
.../index/CollectionSettingsImpl.java | 92 ++++++++++++++
.../index/CollectionSettingsScope.java | 27 ++++
.../index/CollectionSettingsScopeImpl.java | 73 +++++++++++
.../corepersistence/index/IndexServiceImpl.java | 17 ++-
.../index/ReIndexServiceImpl.java | 23 ++--
.../service/ApplicationServiceImpl.java | 19 +--
.../usergrid/persistence/cache/CacheScope.java | 24 ++++
.../impl/shard/DirectedEdgeMeta.java | 8 +-
17 files changed, 461 insertions(+), 269 deletions(-)
----------------------------------------------------------------------