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 2016/09/28 15:26:01 UTC

[1/3] storm git commit: Fix STORM-2017

Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch 5f6919e6e -> f802c7582


Fix STORM-2017


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

Branch: refs/heads/1.0.x-branch
Commit: b4aad619ff05c9055fc67dabe4a7db958fa5aec5
Parents: 3f79f19
Author: Lasse Kiviluoto <kl...@gmail.com>
Authored: Tue Sep 20 14:47:11 2016 +0300
Committer: Lasse Kiviluoto <kl...@gmail.com>
Committed: Tue Sep 20 14:47:11 2016 +0300

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/utils/ShellBoltMessageQueue.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/b4aad619/storm-core/src/jvm/org/apache/storm/utils/ShellBoltMessageQueue.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/ShellBoltMessageQueue.java b/storm-core/src/jvm/org/apache/storm/utils/ShellBoltMessageQueue.java
index 98270ff..33505f7 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/ShellBoltMessageQueue.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/ShellBoltMessageQueue.java
@@ -55,9 +55,9 @@ public class ShellBoltMessageQueue implements Serializable {
      * @param taskIds task ids that received the tuples
      */
     public void putTaskIds(List<Integer> taskIds) {
-        taskIdsQueue.add(taskIds);
         takeLock.lock();
         try {
+            taskIdsQueue.add(taskIds);
             notEmpty.signal();
         } finally {
             takeLock.unlock();


[3/3] storm git commit: Added STORM-2017 to Changelog

Posted by bo...@apache.org.
Added STORM-2017 to Changelog


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

Branch: refs/heads/1.0.x-branch
Commit: f802c7582e57516b42d263d75971444cfe1c28e6
Parents: df79f01
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Sep 28 10:25:13 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Sep 28 10:25:13 2016 -0500

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/f802c758/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58349b0..741ce89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.0.3
+ * STORM-2017: ShellBolt stops reporting task ids
  * STORM-2119: bug in log message printing to stdout
  * STORM-2120: Emit to _spoutConfig.outputStreamId
  * STORM-2101: fixes npe in compute-executors in nimbus


[2/3] storm git commit: Merge branch '1.0.x-branch' of https://github.com/kluoto/storm into STORM-2017-1.0.x

Posted by bo...@apache.org.
Merge branch '1.0.x-branch' of https://github.com/kluoto/storm into STORM-2017-1.0.x

STORM-2017: ShellBolt stops reporting task ids


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

Branch: refs/heads/1.0.x-branch
Commit: df79f0132c9f420907f2999378b7ca779e9e9617
Parents: 5f6919e b4aad61
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Sep 28 08:14:33 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Sep 28 08:14:33 2016 -0500

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/utils/ShellBoltMessageQueue.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------