cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [06/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Thu, 31 Dec 2015 19:01:48 GMT
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 <yukim@apache.org>
Authored: Thu Dec 31 12:42:20 2015 -0600
Committer: Yuki Morishita <yukim@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
----------------------------------------------------------------------


Mime
View raw message