cassandra-commits mailing list archives

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


Mime
View raw message