merge from master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f819b499 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f819b499 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f819b499 Branch: refs/heads/master Commit: f819b4999eac052840ff69552198b184afa0c1e0 Parents: 3fc80c4 8b622ce Author: å«ä¹ <[email protected]> Authored: Fri Feb 26 14:02:45 2016 +0800 Committer: å«ä¹ <[email protected]> Committed: Fri Feb 26 14:02:45 2016 +0800 ---------------------------------------------------------------------- CHANGELOG.md | 5 + bin/flight.bash | 4 +- .../storm/hdfs/bolt/AbstractHdfsBolt.java | 10 +- .../storm/hdfs/bolt/AvroGenericRecordBolt.java | 8 +- .../org/apache/storm/hdfs/bolt/HdfsBolt.java | 8 +- .../storm/hdfs/bolt/SequenceFileBolt.java | 8 +- .../src/clj/org/apache/storm/daemon/drpc.clj | 38 +-- .../clj/org/apache/storm/daemon/logviewer.clj | 65 ++--- .../src/clj/org/apache/storm/daemon/nimbus.clj | 6 +- .../clj/org/apache/storm/daemon/supervisor.clj | 2 +- .../src/clj/org/apache/storm/daemon/worker.clj | 8 +- storm-core/src/clj/org/apache/storm/ui/core.clj | 105 ++++---- .../src/clj/org/apache/storm/ui/helpers.clj | 199 +------------- .../storm/cluster/IStormClusterState.java | 2 + .../storm/cluster/StormClusterStateImpl.java | 8 +- .../storm/metric/FileBasedEventLogger.java | 18 +- .../serialization/SerializationFactory.java | 2 + .../apache/storm/trident/tuple/ConsList.java | 20 +- .../apache/storm/ui/FilterConfiguration.java | 63 +++++ .../jvm/org/apache/storm/ui/IConfigurator.java | 24 ++ .../src/jvm/org/apache/storm/ui/UIHelpers.java | 267 +++++++++++++++++++ .../storm/utils/WorkerBackpressureCallback.java | 2 +- .../storm/utils/WorkerBackpressureThread.java | 38 ++- .../utils/WorkerBackpressureThreadTest.java | 50 ++++ 24 files changed, 617 insertions(+), 343 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/f819b499/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/f819b499/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/f819b499/storm-core/src/clj/org/apache/storm/ui/core.clj ----------------------------------------------------------------------
