Merge branch 'release-2.1.1' into usergrid-1268-akka-211
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/9be069b1 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/9be069b1 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/9be069b1 Branch: refs/heads/release-2.1.1 Commit: 9be069b15bf349e3df22b5d46cf5a2af5ad4e26d Parents: bf7c341 f4c8a01 Author: Dave Johnson <[email protected]> Authored: Mon May 2 17:28:27 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Mon May 2 17:28:27 2016 -0400 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 10 +- .../corepersistence/ApplicationIdCacheImpl.java | 2 +- .../main/resources/usergrid-core-context.xml | 6 + .../shard/impl/NodeShardAllocationImpl.java | 7 +- .../shard/impl/ShardGroupCompactionImpl.java | 18 ++- .../queue/impl/QueueManagerFactoryImpl.java | 27 ++-- .../ApplicationQueueManagerCache.java | 143 +++++++++++++++++++ .../notifications/NotificationsService.java | 6 +- .../services/notifications/QueueListener.java | 58 ++------ .../impl/ApplicationQueueManagerImpl.java | 8 +- .../services/notifiers/NotifiersService.java | 6 + 11 files changed, 213 insertions(+), 78 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/9be069b1/stack/config/src/main/resources/usergrid-default.properties ----------------------------------------------------------------------
