Merge commit 'refs/pull/550/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/6bdb56ff Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6bdb56ff Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6bdb56ff Branch: refs/heads/apigee-sso-provider Commit: 6bdb56ff118fcea7ada8358fb3c4a1e16c7ac659 Parents: 7c8ba0d 00aeed8 Author: Michael Russo <mru...@apigee.com> Authored: Tue Jul 26 12:01:05 2016 -0700 Committer: Michael Russo <mru...@apigee.com> Committed: Tue Jul 26 12:01:05 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 - 8 files changed, 88 insertions(+), 126 deletions(-) ----------------------------------------------------------------------
