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 2015/03/11 21:44:41 UTC
[1/3] storm git commit: Return Jedis into JedisPool with marking
'broken' if connection is broken
Repository: storm
Updated Branches:
refs/heads/master 3113ae1ec -> 8c39e4c49
Return Jedis into JedisPool with marking 'broken' if connection is broken
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6b6eda7a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6b6eda7a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6b6eda7a
Branch: refs/heads/master
Commit: 6b6eda7a4b459448bd26e605674a8df973febb97
Parents: 64d7ac6
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Feb 26 09:43:52 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Feb 26 09:43:52 2015 +0900
----------------------------------------------------------------------
.../main/java/org/apache/storm/redis/trident/state/RedisState.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6b6eda7a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisState.java
----------------------------------------------------------------------
diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisState.java
index f2fd624..72b1267 100644
--- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisState.java
+++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisState.java
@@ -77,7 +77,7 @@ public class RedisState implements State {
* The state updater and querier return the Jedis instance
* */
public void returnJedis(Jedis jedis) {
- this.jedisPool.returnResource(jedis);
+ jedis.close();
}
}
[3/3] storm git commit: Added STORM-690 to Changelog
Posted by bo...@apache.org.
Added STORM-690 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8c39e4c4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8c39e4c4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8c39e4c4
Branch: refs/heads/master
Commit: 8c39e4c49ab7b1b6f6cc2a5070acf97e2432ca48
Parents: 23c69c3
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Mar 11 15:43:56 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Mar 11 15:43:56 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8c39e4c4/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0797c83..a1f46fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@
* STORM-656: Document "external" modules and "Committer Sponsors"
* STORM-657: make the shutdown-worker sleep time before kill -9 configurable
* STORM-663: Create javadocs for BoltDeclarer
+ * STORM-690: Return Jedis into JedisPool with marking 'broken' if connection is broken
## 0.9.3-rc2
* STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor
[2/3] storm git commit: Merge branch 'STORM-690' of
https://github.com/HeartSaVioR/storm into STORM-690
Posted by bo...@apache.org.
Merge branch 'STORM-690' of https://github.com/HeartSaVioR/storm into STORM-690
STORM-690: Return Jedis into JedisPool with marking 'broken' if connection is broken
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/23c69c3d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/23c69c3d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/23c69c3d
Branch: refs/heads/master
Commit: 23c69c3d23b1a7a1e22e6735e43fb09c0eac297d
Parents: 3113ae1 6b6eda7
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Mar 11 15:32:36 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Mar 11 15:32:36 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/storm/redis/trident/state/RedisState.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------