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:08:10 UTC
[15/16] storm git commit: Merge branch 'master' into 0.10.x-branch
Merge branch 'master' 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/8f56e1ee
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8f56e1ee
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8f56e1ee
Branch: refs/heads/0.10.x-branch
Commit: 8f56e1eec64396049e48b9f763df82bcc6fb5e28
Parents: 934cf3b a0c0323
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 2 11:47:30 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 2 11:47:30 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 4 +-
external/storm-redis/README.md | 20 +-
.../trident/state/AbstractRedisMapState.java | 96 +++++++++
.../state/AbstractRedisStateQuerier.java | 69 +++++++
.../state/AbstractRedisStateUpdater.java | 69 +++++++
.../storm/redis/trident/state/KeyFactory.java | 35 ++++
.../storm/redis/trident/state/Options.java | 33 ++++
.../trident/state/RedisClusterMapState.java | 153 +++++----------
.../trident/state/RedisClusterStateQuerier.java | 60 ++----
.../trident/state/RedisClusterStateUpdater.java | 69 +++----
.../redis/trident/state/RedisMapState.java | 194 +++++++------------
.../redis/trident/state/RedisStateQuerier.java | 54 ++----
.../redis/trident/state/RedisStateUpdater.java | 73 ++++---
.../redis/trident/WordCountLookupMapper.java | 40 ++++
.../redis/trident/WordCountStoreMapper.java | 22 +++
.../redis/trident/WordCountTridentRedis.java | 12 +-
.../trident/WordCountTridentRedisCluster.java | 11 +-
.../WordCountTridentRedisClusterMap.java | 6 +-
.../redis/trident/WordCountTridentRedisMap.java | 8 +-
.../redis/trident/WordCountTupleMapper.java | 16 --
20 files changed, 625 insertions(+), 419 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8f56e1ee/CHANGELOG.md
----------------------------------------------------------------------
diff --cc CHANGELOG.md
index 3458630,ad235d8..9cb899f
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,4 -1,7 +1,5 @@@
-## 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.
@@@ -700,4 -702,4 +700,4 @@@ NOTE: The change from 0.7.0 in which Ou
## 0.5.0
-- * Initial release!
++ * Initial release!