You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ar...@apache.org on 2017/02/24 08:48:03 UTC

[2/2] storm git commit: Added STORM-2334 to CHANGELOG.md and fixed minor compilation issue

Added STORM-2334 to CHANGELOG.md and fixed minor compilation issue


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/03e6b841
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/03e6b841
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/03e6b841

Branch: refs/heads/master
Commit: 03e6b841960d7061de6a7dbd01e24dc535594819
Parents: 9e89824
Author: Arun Mahadevan <ar...@apache.org>
Authored: Fri Feb 24 13:37:00 2017 +0530
Committer: Arun Mahadevan <ar...@apache.org>
Committed: Fri Feb 24 14:02:22 2017 +0530

----------------------------------------------------------------------
 CHANGELOG.md                                                       | 1 +
 .../src/jvm/org/apache/storm/starter/JoinBoltExample.java          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/03e6b841/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ff208e..efd7962 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 \ufeff## 2.0.0
+ * STORM-2334: Join Bolt implementation
  * STORM-2367: Documentation for streams API
  * STORM-2365: Support for specifying output stream in event hubs spout
  * STORM-2250: Kafka Spout Refactoring to Increase Modularity and Testability

http://git-wip-us.apache.org/repos/asf/storm/blob/03e6b841/examples/storm-starter/src/jvm/org/apache/storm/starter/JoinBoltExample.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/JoinBoltExample.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/JoinBoltExample.java
index ec9b009..a8359fa 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/JoinBoltExample.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/JoinBoltExample.java
@@ -31,7 +31,7 @@ import org.apache.storm.LocalCluster;
 import java.util.concurrent.TimeUnit;
 
 public class JoinBoltExample {
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
 
         FeederSpout genderSpout = new FeederSpout(new Fields("id", "gender"));
         FeederSpout ageSpout = new FeederSpout(new Fields("id", "age"));