Merge branch 'master' into usergrid-1318-queue
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/71fe06fe Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/71fe06fe Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/71fe06fe Branch: refs/heads/master Commit: 71fe06fec4f89451b5a9000bc728a7c2e4e5cf68 Parents: 907fd0c 3709535 Author: Dave Johnson <snoopd...@apache.org> Authored: Thu Oct 6 10:57:38 2016 -0400 Committer: Dave Johnson <snoopd...@apache.org> Committed: Thu Oct 6 10:57:38 2016 -0400 ---------------------------------------------------------------------- .../asyncevents/AsyncEventServiceImpl.java | 20 +++------- .../index/IndexProcessorFig.java | 2 +- .../index/ReIndexServiceImpl.java | 37 ++++++++--------- stack/corepersistence/actorsystem/pom.xml | 12 +++--- .../persistence/actorsystem/ActorSystemFig.java | 41 ++++++++++++++++++- .../actorsystem/ActorSystemManager.java | 2 +- .../actorsystem/ActorSystemManagerImpl.java | 42 +++++++++++++++----- .../actorsystem/ClusterListener.java | 23 +++++++---- stack/corepersistence/collection/pom.xml | 12 +++--- .../EntityCollectionManagerFactoryImpl.java | 2 + .../uniquevalues/UniqueValuesRouter.java | 4 +- .../uniquevalues/UniqueValuesServiceImpl.java | 10 +---- .../apache/usergrid/rest/ShutdownListener.java | 11 +---- 13 files changed, 131 insertions(+), 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fe06fe/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fe06fe/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fe06fe/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java ----------------------------------------------------------------------