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/26 21:17:13 UTC
[11/11] 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/92554a4d
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/92554a4d
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/92554a4d
Branch: refs/heads/master
Commit: 92554a4d9e88aab351270886965df836fdf0aa8b
Parents: 91abfd8 789f884
Author: Michael Russo <mr...@apigee.com>
Authored: Tue Jul 26 14:16:53 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Tue Jul 26 14:16:53 2016 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityManagerFactory.java | 4 -
.../corepersistence/index/IndexServiceTest.java | 4 -
.../actorsystem/ActorSystemManager.java | 9 +-
.../actorsystem/ActorSystemManagerImpl.java | 40 +++----
.../persistence/actorsystem/RouterProducer.java | 28 ++---
.../actorsystem/ActorServiceServiceTest.java | 8 +-
.../uniquevalues/UniqueValuesServiceImpl.java | 117 +++++++++----------
.../collection/AbstractUniqueValueTest.java | 4 -
.../index/impl/EsEntityIndexImpl.java | 53 +++++----
.../persistence/index/impl/EntityIndexTest.java | 12 +-
stack/pom.xml | 2 +-
stack/query-validator/pom.xml | 32 ++---
.../query/validator/AbstractQueryIT.java | 23 ++--
.../usergrid/query/validator/QueryITSuite.java | 12 +-
.../query/validator/users/UserQueryIT.java | 54 ++++++---
.../test/resources/usergrid-test-context.xml | 5 +-
.../java/org/apache/usergrid/rest/ITSetup.java | 56 +++++++--
17 files changed, 243 insertions(+), 220 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/92554a4d/stack/pom.xml
----------------------------------------------------------------------