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/06/19 23:06:34 UTC
[23/23] git commit: Merge tag 'v0.9.2-incubating' into security
Merge tag 'v0.9.2-incubating' into security
[maven-release-plugin] copy for tag v0.9.2-incubating
Conflicts:
storm-core/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/79089ad0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/79089ad0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/79089ad0
Branch: refs/heads/security
Commit: 79089ad0da80e38eb36b7ea91be8b43795dc4efb
Parents: 87cdbf5 24d4a14
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Thu Jun 19 16:04:02 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Thu Jun 19 16:04:02 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 6 +-
examples/storm-starter/pom.xml | 2 +-
external/storm-kafka/pom.xml | 2 +-
.../src/jvm/storm/kafka/PartitionManager.java | 2 +-
pom.xml | 4 +-
.../maven-shade-clojure-transformer/pom.xml | 2 +-
storm-core/pom.xml | 14 +-
.../backtype/storm/task/TopologyContext.java | 11 ++
.../backtype/storm/utils/DisruptorQueue.java | 70 ++++++---
.../storm/utils/DisruptorQueueTest.java | 153 +++++++++++++++++++
storm-dist/binary/pom.xml | 2 +-
storm-dist/source/pom.xml | 2 +-
12 files changed, 237 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/79089ad0/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/79089ad0/storm-core/pom.xml
----------------------------------------------------------------------