Merge commit 'refs/pull/499/head' of github.com:apache/usergrid into 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/5a508c6e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/5a508c6e Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/5a508c6e Branch: refs/heads/asf-site Commit: 5a508c6e63575efcf3f997a971b11b84f33b0dae Parents: c1375bf 9486cdd Author: Michael Russo <[email protected]> Authored: Tue Apr 12 00:26:05 2016 +0200 Committer: Michael Russo <[email protected]> Committed: Tue Apr 12 00:26:05 2016 +0200 ---------------------------------------------------------------------- .../corepersistence/ApplicationIdCache.java | 6 +- .../corepersistence/ApplicationIdCacheImpl.java | 64 ++++++++------------ .../corepersistence/CpEntityManagerFactory.java | 9 ++- .../persistence/EntityManagerFactory.java | 4 +- .../index/AsyncEventServiceImplTest.java | 23 +++---- .../cassandra/EntityManagerFactoryImplIT.java | 8 +-- .../apache/usergrid/mongo/BasicMongoTest.java | 8 +-- .../apache/usergrid/mongo/MongoQueryTest.java | 18 +++--- .../organizations/OrganizationResource.java | 8 +-- .../cassandra/ManagementServiceImpl.java | 8 +-- .../migration/AppInfoMigrationPluginTest.java | 8 +-- 11 files changed, 70 insertions(+), 94 deletions(-) ----------------------------------------------------------------------
