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 57befa1a3dbfbbca93299223007559f00c1c6f55 Merge: b074136 da12d89 Author: Stig Rohde Døssing <[email protected]> AuthorDate: Thu Mar 7 07:10:12 2019 +0100 Merge branch 'STORM-3321' of https://github.com/srdo/storm into asfgit-master .../org/apache/storm/metric/cgroup/CGroupMetricsBase.java | 2 +- .../src/jvm/org/apache/storm/nimbus/ILeaderElector.java | 11 +++++++++++ .../src/jvm/org/apache/storm/testing/FixedTupleSpout.java | 3 --- .../jvm/org/apache/storm/testing/MockLeaderElector.java | 6 ++++++ .../src/main/java/org/apache/storm/LocalCluster.java | 14 ++++++++++++++ .../main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 6 +++++- .../apache/storm/daemon/supervisor/ReadClusterState.java | 9 +++++---- .../org/apache/storm/daemon/supervisor/Supervisor.java | 3 ++- .../java/org/apache/storm/zookeeper/LeaderElectorImp.java | 8 ++++++++ .../src/test/java/org/apache/storm/TestingTest.java | 5 +---- 10 files changed, 53 insertions(+), 14 deletions(-)
