You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/07/15 17:09:27 UTC
[3/3] storm git commit: Merge branch '1.0.x-branch' of
https://git-wip-us.apache.org/repos/asf/storm into 1.0.x-branch
Merge branch '1.0.x-branch' of https://git-wip-us.apache.org/repos/asf/storm into 1.0.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/42e9baa7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/42e9baa7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/42e9baa7
Branch: refs/heads/1.0.x-branch
Commit: 42e9baa71e5b916c22f14da79bebb44dba89cc4f
Parents: d1f420b 3033aa2
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Jul 15 13:09:03 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Jul 15 13:09:03 2016 -0400
----------------------------------------------------------------------
CHANGELOG.md | 2 +
.../jvm/org/apache/storm/spout/ShellSpout.java | 56 ++++++++++++++++----
.../jvm/org/apache/storm/task/ShellBolt.java | 14 +++--
3 files changed, 58 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/42e9baa7/CHANGELOG.md
----------------------------------------------------------------------
diff --cc CHANGELOG.md
index feb555d,65cb9a2..170aa4e
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,5 -1,6 +1,7 @@@
## 1.0.2
+ * STORM-1939: Frequent InterruptedException raised by ShellBoltMessageQueue.poll
+ * STORM-1968: Storm logviewer does not work for nimbus.log in secure cluster
+ * STORM-1928: ShellSpout should check heartbeat while ShellSpout is waiting for subprocess to sync
* STORM-1922: Supervisor summary default order by host
* STORM-1956: Disabling Backpressure by default
* STORM-1934: Fix race condition between sync-supervisor and sync-processes