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 2015/05/29 18:03:51 UTC
[5/5] storm git commit: Merge branch '0.10.x-branch' of
https://git-wip-us.apache.org/repos/asf/storm into 0.10.x-branch
Merge branch '0.10.x-branch' of https://git-wip-us.apache.org/repos/asf/storm into 0.10.x-branch
Conflicts:
CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/02f4ae96
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/02f4ae96
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/02f4ae96
Branch: refs/heads/0.10.x-branch
Commit: 02f4ae96bcc962e079f9a64794b19df6634db511
Parents: c2db376 f0281ec
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri May 29 12:03:31 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 29 12:03:31 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 2 ++
external/storm-redis/README.md | 4 ++--
.../storm/redis/trident/state/RedisClusterStateUpdater.java | 9 +++++++--
.../apache/storm/redis/trident/state/RedisStateUpdater.java | 9 +++++++--
.../apache/storm/redis/trident/WordCountTridentRedis.java | 2 +-
.../storm/redis/trident/WordCountTridentRedisCluster.java | 2 +-
.../src/ui/public/templates/component-page-template.html | 2 +-
7 files changed, 21 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/02f4ae96/CHANGELOG.md
----------------------------------------------------------------------
diff --cc CHANGELOG.md
index d57890e,36c357e..221a0f4
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,5 -1,6 +1,7 @@@
## 0.10.0
+ * STORM-728: Put emitted and transferred stats under correct columns
+ * STORM-790: Log "task is null" instead of let worker died when task is null in transfer-fn
+ * STORM-752: [storm-redis] Clarify Redis*StateUpdater's expire is optional
* STORM-786: KafkaBolt should ack tick tuples
* STORM-512: KafkaBolt doesn't handle ticks properly
* STORM-788: Fix key for process latencies