You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@storm.apache.org by sr...@apache.org on 2019/05/05 14:14:11 UTC

[storm] 04/04: Merge branch 'STORM-3379' of https://github.com/srdo/storm into asfgit-master

This is an automated email from the ASF dual-hosted git repository.

srdo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git

commit 26e6c06c4b94aa121457889b1bd22c74fa41b3f7
Merge: 2bf972e c985695
Author: Stig Rohde Døssing <sr...@apache.org>
AuthorDate: Sun May 5 16:13:19 2019 +0200

    Merge branch 'STORM-3379' of https://github.com/srdo/storm into asfgit-master

 .../jvm/org/apache/storm/daemon/worker/Worker.java |  26 +++--
 .../apache/storm/daemon/worker/WorkerState.java    |  45 +++++----
 .../auth/workertoken/WorkerTokenAuthorizer.java    |   2 +-
 .../org/apache/storm/utils/SupervisorClient.java   |   5 +-
 .../apache/storm/utils/SupervisorIfaceFactory.java |  30 ++++++
 .../apache/storm/daemon/supervisor/Container.java  |   4 +-
 .../storm/daemon/supervisor/ContainerLauncher.java |   7 +-
 .../storm/daemon/supervisor/LocalContainer.java    |  10 +-
 .../daemon/supervisor/LocalContainerLauncher.java  |   7 +-
 .../storm/daemon/supervisor/ReadClusterState.java  |   3 +-
 .../apache/storm/daemon/supervisor/Supervisor.java | 108 ++++++++++++---------
 .../nimbus/AssignmentDistributionService.java      |   2 +-
 12 files changed, 164 insertions(+), 85 deletions(-)