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/23 21:20:28 UTC
[04/10] storm git commit: Merge branch 'master' of
https://github.com/apache/storm
Merge branch 'master' of https://github.com/apache/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2e9e36f9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2e9e36f9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2e9e36f9
Branch: refs/heads/master
Commit: 2e9e36f90a691d517d7472b6f9f4a1b6921c7881
Parents: 6ede078 5a46038
Author: joe <ta...@gmail.com>
Authored: Tue Oct 28 22:25:28 2014 +0800
Committer: joe <ta...@gmail.com>
Committed: Tue Oct 28 22:25:28 2014 +0800
----------------------------------------------------------------------
CHANGELOG.md | 12 +-
LICENSE | 20 +-
bin/storm | 1 +
examples/storm-starter/pom.xml | 2 +-
external/storm-hbase/pom.xml | 2 +-
.../storm/hbase/bolt/HBaseLookupBolt.java | 2 +-
.../hbase/bolt/mapper/HBaseValueMapper.java | 4 +-
.../storm/hbase/trident/state/HBaseState.java | 6 +-
.../hbase/topology/WordCountValueMapper.java | 3 +-
external/storm-hdfs/pom.xml | 2 +-
external/storm-kafka/pom.xml | 2 +-
.../src/jvm/storm/kafka/KafkaUtils.java | 63 ++--
.../src/jvm/storm/kafka/PartitionManager.java | 11 +-
.../jvm/storm/kafka/UpdateOffsetException.java | 5 +
.../src/test/storm/kafka/KafkaUtilsTest.java | 6 +-
logback/cluster.xml | 4 +-
pom.xml | 2 +-
.../maven-shade-clojure-transformer/pom.xml | 2 +-
storm-core/pom.xml | 6 +-
.../clj/backtype/storm/daemon/supervisor.clj | 10 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 50 +--
storm-core/src/dev/resources/storm.py | 248 ++++++++++++-
storm-core/src/dev/resources/storm.rb | 228 +++++++++++-
storm-core/src/multilang/js/storm.js | 349 +++++++++++++++++++
storm-core/src/ui/public/component.html | 8 +-
storm-core/src/ui/public/js/purl.js | 267 --------------
storm-core/src/ui/public/js/script.js | 3 +-
storm-core/src/ui/public/js/url.min.js | 1 +
storm-core/src/ui/public/js/visualization.js | 2 +-
.../templates/component-page-template.html | 6 +-
.../public/templates/index-page-template.html | 2 +-
.../templates/topology-page-template.html | 14 +-
storm-core/src/ui/public/topology.html | 8 +-
.../test/clj/backtype/storm/supervisor_test.clj | 16 +-
storm-dist/binary/LICENSE | 10 +-
storm-dist/binary/pom.xml | 2 +-
storm-dist/source/pom.xml | 2 +-
37 files changed, 981 insertions(+), 400 deletions(-)
----------------------------------------------------------------------