You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2014/06/19 23:47:19 UTC
[1/3] git commit: Expose managed spout ids publicly
Repository: incubator-storm
Updated Branches:
refs/heads/master a821d5cb2 -> 093ce720e
Expose managed spout ids publicly
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/2d64f7e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/2d64f7e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/2d64f7e8
Branch: refs/heads/master
Commit: 2d64f7e80585281e64514d1be4f5efae83e7a9a4
Parents: eee8b24
Author: Aaron Zimmerman <az...@sproutsocial.com>
Authored: Fri May 30 07:39:10 2014 -0500
Committer: Aaron Zimmerman <az...@sproutsocial.com>
Committed: Fri May 30 07:40:26 2014 -0500
----------------------------------------------------------------------
.../src/jvm/storm/trident/topology/MasterBatchCoordinator.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/2d64f7e8/storm-core/src/jvm/storm/trident/topology/MasterBatchCoordinator.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/topology/MasterBatchCoordinator.java b/storm-core/src/jvm/storm/trident/topology/MasterBatchCoordinator.java
index 97f62d3..78cdd8d 100644
--- a/storm-core/src/jvm/storm/trident/topology/MasterBatchCoordinator.java
+++ b/storm-core/src/jvm/storm/trident/topology/MasterBatchCoordinator.java
@@ -76,6 +76,10 @@ public class MasterBatchCoordinator extends BaseRichSpout {
_spouts = spouts;
}
+ public List<String> getManagedSpoutIds(){
+ return _managedSpoutIds;
+ }
+
@Override
public void activate() {
_active = true;
[2/3] git commit: Merge branch 'master' of
https://github.com/aaronzimmerman/incubator-storm into storm-337
Posted by da...@apache.org.
Merge branch 'master' of https://github.com/aaronzimmerman/incubator-storm into storm-337
STORM-337: Expose managed spout ids publicly
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/1a57aa8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/1a57aa8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/1a57aa8f
Branch: refs/heads/master
Commit: 1a57aa8fd0e8d53114da9435a61f319014dbb428
Parents: a821d5c 2d64f7e
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Jun 19 16:37:01 2014 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Jun 19 16:37:01 2014 -0500
----------------------------------------------------------------------
.../src/jvm/storm/trident/topology/MasterBatchCoordinator.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
[3/3] git commit: Update CHANGELOG and README for STORM-337
Posted by da...@apache.org.
Update CHANGELOG and README for STORM-337
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/093ce720
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/093ce720
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/093ce720
Branch: refs/heads/master
Commit: 093ce720ec4b333c40b1cad3a0a182c6aaae59d3
Parents: 1a57aa8
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Jun 19 16:41:26 2014 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Jun 19 16:41:26 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 3 +++
README.markdown | 1 +
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/093ce720/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95024da..5a03f46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.9.3-incubating
+ * STORM-337: Expose managed spout ids publicly
+
## 0.9.2-incubating
* STORM-66: send taskid on initial handshake
* STORM-342: Contention in Disruptor Queue which may cause out of order or lost messages
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/093ce720/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index c40e7fd..556a2c0 100644
--- a/README.markdown
+++ b/README.markdown
@@ -143,6 +143,7 @@ under the License.
* Suresh Srinivas ([@sureshms](https://github.com/sureshms))
* thinker0 ([@thinker0](https://github.com/thinker0))
* Troy Ding ([@troyding](https://github.com/troyding))
+* Aaron Zimmerman ([@aaronzimmerman](https://github.com/aaronzimmerman))
## Acknowledgements