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 2014/07/01 22:40:47 UTC
[16/24] git commit: Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/62f854a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/62f854a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/62f854a8
Branch: refs/heads/master
Commit: 62f854a81bc643181bc38b1e3dc6d1164a94d874
Parents: a4b26af d448e34
Author: JuDasheng <ju...@meituan.com>
Authored: Fri Jun 13 15:30:09 2014 +0800
Committer: JuDasheng <ju...@meituan.com>
Committed: Fri Jun 13 15:30:09 2014 +0800
----------------------------------------------------------------------
CHANGELOG.md | 3 +
DEVELOPER.md | 8 +
storm-core/pom.xml | 7 +
.../src/clj/backtype/storm/LocalCluster.clj | 71 +-
storm-core/src/clj/backtype/storm/LocalDRPC.clj | 5 +-
storm-core/src/clj/backtype/storm/bootstrap.clj | 9 +-
storm-core/src/clj/backtype/storm/clojure.clj | 10 +-
storm-core/src/clj/backtype/storm/cluster.clj | 427 +++++------
storm-core/src/clj/backtype/storm/config.clj | 145 ++--
.../src/clj/backtype/storm/daemon/drpc.clj | 135 ++--
storm-core/src/clj/backtype/storm/disruptor.clj | 80 +--
storm-core/src/clj/backtype/storm/event.clj | 49 +-
storm-core/src/clj/backtype/storm/log.clj | 22 +-
.../clj/backtype/storm/process_simulator.clj | 27 +-
storm-core/src/clj/backtype/storm/stats.clj | 289 ++++----
storm-core/src/clj/backtype/storm/testing.clj | 523 +++++++-------
storm-core/src/clj/backtype/storm/testing4j.clj | 58 +-
storm-core/src/clj/backtype/storm/thrift.clj | 255 ++++---
storm-core/src/clj/backtype/storm/timer.clj | 106 +--
storm-core/src/clj/backtype/storm/tuple.clj | 7 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 559 ++++++++-------
storm-core/src/clj/backtype/storm/util.clj | 717 ++++++++++---------
storm-core/src/clj/backtype/storm/zookeeper.clj | 158 ++--
.../netty/NettyRenameThreadFactory.java | 2 +-
.../backtype/storm/task/TopologyContext.java | 11 +
.../backtype/storm/utils/DisruptorQueue.java | 70 +-
.../storm/utils/DisruptorQueueTest.java | 153 ++++
27 files changed, 2167 insertions(+), 1739 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/62f854a8/storm-core/src/jvm/backtype/storm/task/TopologyContext.java
----------------------------------------------------------------------