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:23:17 UTC
[1/2] storm git commit: Merge branch '1.0.x-branch' of
https://github.com/kluoto/storm into STORM-2017-1.0.x
Repository: storm
Updated Branches:
refs/heads/master 35a73151a -> f3e4dd3ff
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/3b0c69d9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3b0c69d9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3b0c69d9
Branch: refs/heads/master
Commit: 3b0c69d9cf619d836d4f4f667a3b373bff354a9a
Parents: 35a7315
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:16:25 2016 -0500
----------------------------------------------------------------------
.../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/3b0c69d9/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();
[2/2] storm git commit: Added STORM-2017 to Chengelog
Posted by bo...@apache.org.
Added STORM-2017 to Chengelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f3e4dd3f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f3e4dd3f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f3e4dd3f
Branch: refs/heads/master
Commit: f3e4dd3ffa818d575f531edde6045cdf9c21decb
Parents: 3b0c69d
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Sep 28 08:17:23 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Sep 28 08:17:23 2016 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f3e4dd3f/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8c77f3..1f60832 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -206,6 +206,7 @@
* STORM-1868: Modify TridentKafkaWordCount to run in distributed mode
## 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