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:10 UTC

[storm] 03/04: Merge branch 'STORM-3376' 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 2bf972e050af2356940f2b9ce59af6d660f49766
Merge: 8951e7a aaf1113
Author: Stig Rohde Døssing <sr...@apache.org>
AuthorDate: Sun May 5 16:12:55 2019 +0200

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

 integration-test/config/storm.yaml                 |  6 ++
 .../test/org/apache/storm/sql/TestStormSql.java    | 45 +++++-----
 .../backends/streams/TestPlanCompiler.java         | 96 ++++++++++-----------
 .../src/test/org/apache/storm/sql/TestUtils.java   | 23 ++---
 .../org/apache/storm/cluster/IStateStorage.java    |  4 +-
 .../storm/cluster/StormClusterStateImpl.java       |  8 +-
 .../jvm/org/apache/storm/daemon/worker/Worker.java |  4 +-
 .../apache/storm/daemon/worker/WorkerState.java    | 40 ++++-----
 .../org/apache/storm/messaging/IConnection.java    | 14 ----
 .../jvm/org/apache/storm/messaging/IContext.java   |  5 +-
 .../org/apache/storm/messaging/local/Context.java  | 98 ++++++++++------------
 .../org/apache/storm/messaging/netty/Client.java   | 15 ----
 .../org/apache/storm/messaging/netty/Context.java  |  6 +-
 .../org/apache/storm/messaging/netty/Server.java   | 29 +++----
 .../apache/storm/security/auth/ThriftServer.java   |  8 +-
 .../auth/digest/DigestSaslTransportPlugin.java     | 11 ++-
 .../auth/kerberos/KerberosSaslTransportPlugin.java | 11 ++-
 .../security/auth/sasl/SaslTransportPlugin.java    | 11 ++-
 .../auth/workertoken/WorkerTokenAuthorizer.java    | 13 ++-
 .../apache/storm/messaging/netty/NettyTest.java    | 28 +++----
 .../main/java/org/apache/storm/LocalCluster.java   |  6 +-
 .../apache/storm/blobstore/LocalFsBlobStore.java   |  1 +
 .../org/apache/storm/daemon/supervisor/Slot.java   |  2 +-
 .../org/apache/storm/localizer/AsyncLocalizer.java |  4 +-
 .../security/auth/workertoken/WorkerTokenTest.java | 24 +++---
 25 files changed, 247 insertions(+), 265 deletions(-)