You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/12/31 20:01:43 UTC
[01/10] cassandra git commit: Fix binding to any address in
CqlBulkRecordWriter
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 0d51b65e3 -> a55fd76dd
refs/heads/cassandra-2.2 f9ac65745 -> 0967825dd
refs/heads/cassandra-3.0 7f6d039f9 -> fe043b631
refs/heads/trunk e8d3c9eae -> b4e2a80a6
Fix binding to any address in CqlBulkRecordWriter
patch by yukim; reviewed by snazy for CASSANDRA-9309
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a55fd76d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a55fd76d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a55fd76d
Branch: refs/heads/cassandra-2.1
Commit: a55fd76ddd96e3ed2d967910f0572804fcfacc2f
Parents: 0d51b65
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Jul 8 16:29:36 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 31 12:40:57 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a55fd76d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9997e1e..0bd5485 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309)
* Fix the way we replace sstables after anticompaction (CASSANDRA-10831)
* cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875)
* Log error when stream session fails (CASSANDRA-9294)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a55fd76d/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
index 66a0362..400fd35 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
@@ -131,10 +131,11 @@ public class OutboundTcpConnectionPool
}
else
{
- Socket socket = SocketChannel.open(new InetSocketAddress(endpoint, DatabaseDescriptor.getStoragePort())).socket();
- if (Config.getOutboundBindAny() && !socket.isBound())
- socket.bind(new InetSocketAddress(FBUtilities.getLocalAddress(), 0));
- return socket;
+ SocketChannel channel = SocketChannel.open();
+ if (!Config.getOutboundBindAny())
+ channel.bind(new InetSocketAddress(FBUtilities.getLocalAddress(), 0));
+ channel.connect(new InetSocketAddress(endpoint, DatabaseDescriptor.getStoragePort()));
+ return channel.socket();
}
}
[07/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0967825d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0967825d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0967825d
Branch: refs/heads/trunk
Commit: 0967825dd8c01da42e989964130579d07fa9b3c2
Parents: f9ac657 a55fd76
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Dec 31 12:42:20 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 31 12:42:20 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0967825d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 23d6bae,0bd5485..b700102
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,15 @@@
-2.1.13
+2.2.5
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
+ * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
+ * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
+ * Add new types to Stress (CASSANDRA-9556)
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+Merged from 2.1:
+ * Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309)
- * Fix the way we replace sstables after anticompaction (CASSANDRA-10831)
* cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875)
* Log error when stream session fails (CASSANDRA-9294)
* Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0967825d/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
----------------------------------------------------------------------
[06/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0967825d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0967825d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0967825d
Branch: refs/heads/cassandra-2.2
Commit: 0967825dd8c01da42e989964130579d07fa9b3c2
Parents: f9ac657 a55fd76
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Dec 31 12:42:20 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 31 12:42:20 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0967825d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 23d6bae,0bd5485..b700102
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,15 @@@
-2.1.13
+2.2.5
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
+ * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
+ * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
+ * Add new types to Stress (CASSANDRA-9556)
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+Merged from 2.1:
+ * Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309)
- * Fix the way we replace sstables after anticompaction (CASSANDRA-10831)
* cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875)
* Log error when stream session fails (CASSANDRA-9294)
* Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0967825d/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
----------------------------------------------------------------------
[03/10] cassandra git commit: Fix binding to any address in
CqlBulkRecordWriter
Posted by yu...@apache.org.
Fix binding to any address in CqlBulkRecordWriter
patch by yukim; reviewed by snazy for CASSANDRA-9309
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a55fd76d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a55fd76d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a55fd76d
Branch: refs/heads/cassandra-3.0
Commit: a55fd76ddd96e3ed2d967910f0572804fcfacc2f
Parents: 0d51b65
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Jul 8 16:29:36 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 31 12:40:57 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a55fd76d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9997e1e..0bd5485 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309)
* Fix the way we replace sstables after anticompaction (CASSANDRA-10831)
* cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875)
* Log error when stream session fails (CASSANDRA-9294)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a55fd76d/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
index 66a0362..400fd35 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
@@ -131,10 +131,11 @@ public class OutboundTcpConnectionPool
}
else
{
- Socket socket = SocketChannel.open(new InetSocketAddress(endpoint, DatabaseDescriptor.getStoragePort())).socket();
- if (Config.getOutboundBindAny() && !socket.isBound())
- socket.bind(new InetSocketAddress(FBUtilities.getLocalAddress(), 0));
- return socket;
+ SocketChannel channel = SocketChannel.open();
+ if (!Config.getOutboundBindAny())
+ channel.bind(new InetSocketAddress(FBUtilities.getLocalAddress(), 0));
+ channel.connect(new InetSocketAddress(endpoint, DatabaseDescriptor.getStoragePort()));
+ return channel.socket();
}
}
[08/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@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/fe043b63
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe043b63
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe043b63
Branch: refs/heads/cassandra-3.0
Commit: fe043b631e163dd8e83f285ccbb5b16d1dc24137
Parents: 7f6d039 0967825
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Dec 31 12:42:34 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 31 12:42:34 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe043b63/CHANGES.txt
----------------------------------------------------------------------
[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4e2a80a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4e2a80a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4e2a80a
Branch: refs/heads/trunk
Commit: b4e2a80a6f810042ab3f9c2453e4f665b8c91502
Parents: e8d3c9e fe043b6
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Dec 31 12:51:57 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 31 12:51:57 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4e2a80a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5cd1b4c,03b9ecb..4a1f137
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -38,7 -14,12 +38,8 @@@ Merged from 2.2
* (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
* Add new types to Stress (CASSANDRA-9556)
* Add property to allow listening on broadcast interface (CASSANDRA-9748)
- * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
- * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
- * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
- * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
Merged from 2.1:
+ * Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309)
* cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875)
* Log error when stream session fails (CASSANDRA-9294)
* Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@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/fe043b63
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe043b63
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe043b63
Branch: refs/heads/trunk
Commit: fe043b631e163dd8e83f285ccbb5b16d1dc24137
Parents: 7f6d039 0967825
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Dec 31 12:42:34 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 31 12:42:34 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe043b63/CHANGES.txt
----------------------------------------------------------------------
[04/10] cassandra git commit: Fix binding to any address in
CqlBulkRecordWriter
Posted by yu...@apache.org.
Fix binding to any address in CqlBulkRecordWriter
patch by yukim; reviewed by snazy for CASSANDRA-9309
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a55fd76d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a55fd76d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a55fd76d
Branch: refs/heads/trunk
Commit: a55fd76ddd96e3ed2d967910f0572804fcfacc2f
Parents: 0d51b65
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Jul 8 16:29:36 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 31 12:40:57 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a55fd76d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9997e1e..0bd5485 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309)
* Fix the way we replace sstables after anticompaction (CASSANDRA-10831)
* cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875)
* Log error when stream session fails (CASSANDRA-9294)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a55fd76d/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
index 66a0362..400fd35 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
@@ -131,10 +131,11 @@ public class OutboundTcpConnectionPool
}
else
{
- Socket socket = SocketChannel.open(new InetSocketAddress(endpoint, DatabaseDescriptor.getStoragePort())).socket();
- if (Config.getOutboundBindAny() && !socket.isBound())
- socket.bind(new InetSocketAddress(FBUtilities.getLocalAddress(), 0));
- return socket;
+ SocketChannel channel = SocketChannel.open();
+ if (!Config.getOutboundBindAny())
+ channel.bind(new InetSocketAddress(FBUtilities.getLocalAddress(), 0));
+ channel.connect(new InetSocketAddress(endpoint, DatabaseDescriptor.getStoragePort()));
+ return channel.socket();
}
}
[02/10] cassandra git commit: Fix binding to any address in
CqlBulkRecordWriter
Posted by yu...@apache.org.
Fix binding to any address in CqlBulkRecordWriter
patch by yukim; reviewed by snazy for CASSANDRA-9309
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a55fd76d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a55fd76d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a55fd76d
Branch: refs/heads/cassandra-2.2
Commit: a55fd76ddd96e3ed2d967910f0572804fcfacc2f
Parents: 0d51b65
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Jul 8 16:29:36 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 31 12:40:57 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a55fd76d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9997e1e..0bd5485 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309)
* Fix the way we replace sstables after anticompaction (CASSANDRA-10831)
* cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875)
* Log error when stream session fails (CASSANDRA-9294)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a55fd76d/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
index 66a0362..400fd35 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
@@ -131,10 +131,11 @@ public class OutboundTcpConnectionPool
}
else
{
- Socket socket = SocketChannel.open(new InetSocketAddress(endpoint, DatabaseDescriptor.getStoragePort())).socket();
- if (Config.getOutboundBindAny() && !socket.isBound())
- socket.bind(new InetSocketAddress(FBUtilities.getLocalAddress(), 0));
- return socket;
+ SocketChannel channel = SocketChannel.open();
+ if (!Config.getOutboundBindAny())
+ channel.bind(new InetSocketAddress(FBUtilities.getLocalAddress(), 0));
+ channel.connect(new InetSocketAddress(endpoint, DatabaseDescriptor.getStoragePort()));
+ return channel.socket();
}
}
[05/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0967825d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0967825d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0967825d
Branch: refs/heads/cassandra-3.0
Commit: 0967825dd8c01da42e989964130579d07fa9b3c2
Parents: f9ac657 a55fd76
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Dec 31 12:42:20 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 31 12:42:20 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0967825d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 23d6bae,0bd5485..b700102
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,15 @@@
-2.1.13
+2.2.5
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
+ * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
+ * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
+ * Add new types to Stress (CASSANDRA-9556)
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+Merged from 2.1:
+ * Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309)
- * Fix the way we replace sstables after anticompaction (CASSANDRA-10831)
* cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875)
* Log error when stream session fails (CASSANDRA-9294)
* Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0967825d/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
----------------------------------------------------------------------