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/06/02 22:10:21 UTC
[7/7] storm git commit: Merge branch 'master' into 0.10.x-branch
Merge branch 'master' into 0.10.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/efdf9496
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/efdf9496
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/efdf9496
Branch: refs/heads/0.10.x-branch
Commit: efdf9496669084e52852b5324f650160dd9236f6
Parents: f6e9c35 e7818af
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 2 16:08:36 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 2 16:08:36 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 3 ++-
.../org/apache/storm/redis/trident/state/Options.java | 1 +
.../storm/redis/trident/state/RedisClusterMapState.java | 9 ++++++++-
.../apache/storm/redis/trident/state/RedisMapState.java | 11 +++++++++++
4 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/efdf9496/CHANGELOG.md
----------------------------------------------------------------------
diff --cc CHANGELOG.md
index afe90a9,f9f7999..09f2e94
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,5 -1,6 +1,4 @@@
-## 0.11.0
-
## 0.10.0
- * STORM-753: Improve RedisStateQuerier to convert List<Values> from Redis value
* STORM-835: Netty Client hold batch object until io operation complete
* STORM-827: Allow AutoTGT to work with storm-hdfs too.
* STORM-821: Adding connection provider interface to decouple jdbc connector from a single connection pooling implementation.