You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/08/21 20:53:11 UTC
[1/2] cassandra git commit: Fix thrift_hsha_test dtest on Windows
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 f60322a71 -> 69013c95b
Fix thrift_hsha_test dtest on Windows
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10076
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd19a7fc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd19a7fc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd19a7fc
Branch: refs/heads/cassandra-3.0
Commit: dd19a7fcfdfcb9270dc517313012e97d1e24710c
Parents: ab62876
Author: Paulo Motta <pa...@gmail.com>
Authored: Fri Aug 21 14:51:29 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Aug 21 14:51:29 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd19a7fc/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index ee30073..cb168bc 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -293,7 +293,7 @@ public class OutboundTcpConnection extends Thread
catch (Exception e)
{
disconnect();
- if (e instanceof IOException)
+ if (e instanceof IOException || e.getCause() instanceof IOException)
{
if (logger.isDebugEnabled())
logger.debug("error writing to {}", poolReference.endPoint(), e);
[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69013c95
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69013c95
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69013c95
Branch: refs/heads/cassandra-3.0
Commit: 69013c95b6a0f8e6100a61fc8c03385a8037db3a
Parents: f60322a dd19a7f
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Aug 21 14:52:50 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Aug 21 14:52:50 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------