You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/01/14 17:05:23 UTC
[02/44] storm git commit: Merge branch 'master' into retryDelay
Merge branch 'master' into retryDelay
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f9d2948a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f9d2948a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f9d2948a
Branch: refs/heads/master
Commit: f9d2948a9e2dadbbb99128fd6570038e2096eabd
Parents: cac70e7 58f6582
Author: Rick Kilgore <ri...@hbo.com>
Authored: Wed Sep 3 15:04:32 2014 -0700
Committer: Rick Kilgore <ri...@hbo.com>
Committed: Wed Sep 3 15:04:32 2014 -0700
----------------------------------------------------------------------
CHANGELOG.md | 20 +
README.markdown | 2 +
STORM-UI-REST-API.md | 5 +-
bin/storm.cmd | 10 +-
conf/defaults.yaml | 1 +
.../src/jvm/storm/kafka/KafkaUtils.java | 5 +-
storm-core/pom.xml | 53 +-
.../src/clj/backtype/storm/daemon/common.clj | 3 +
.../src/clj/backtype/storm/daemon/nimbus.clj | 4 +-
.../clj/backtype/storm/daemon/supervisor.clj | 24 +-
storm-core/src/clj/backtype/storm/event.clj | 3 +
.../backtype/storm/scheduler/EvenScheduler.clj | 2 +-
storm-core/src/clj/backtype/storm/testing.clj | 9 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 42 +-
storm-core/src/clj/backtype/storm/util.clj | 2 +-
storm-core/src/jvm/backtype/storm/Config.java | 38 +-
.../backtype/storm/messaging/netty/Client.java | 27 +-
.../storm/multilang/JsonSerializer.java | 7 +-
.../DefaultSerializationDelegate.java | 61 ++
.../GzipBridgeSerializationDelegate.java | 64 ++
.../GzipSerializationDelegate.java | 68 +++
.../serialization/SerializationDelegate.java | 35 ++
.../src/jvm/backtype/storm/task/ShellBolt.java | 7 +-
.../StormBoundedExponentialBackoffRetry.java | 74 +++
.../src/jvm/backtype/storm/utils/Utils.java | 91 ++-
.../templates/component-page-template.html | 593 ++++++++++++++-----
.../public/templates/index-page-template.html | 219 +++++--
.../templates/topology-page-template.html | 195 +++++-
.../test/clj/backtype/storm/scheduler_test.clj | 21 +
.../test/clj/backtype/storm/supervisor_test.clj | 60 ++
.../test/clj/backtype/storm/utils_test.clj | 3 +-
.../GzipBridgeSerializationDelegateTest.java | 82 +++
...StormBoundedExponentialBackoffRetryTest.java | 101 ++++
33 files changed, 1615 insertions(+), 316 deletions(-)
----------------------------------------------------------------------