Merge branch 'hotfix-20160819'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/77d20269 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/77d20269 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/77d20269 Branch: refs/heads/asf-site Commit: 77d2026907b03625ad7e1ef742c8656712497c8d Parents: 9947d48 ef8899a Author: Michael Russo <[email protected]> Authored: Fri Sep 30 18:15:27 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Fri Sep 30 18:15:27 2016 -0700 ---------------------------------------------------------------------- .../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/77d20269/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ReIndexServiceImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/77d20269/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerFactoryImpl.java ----------------------------------------------------------------------
