cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Tue, 08 Mar 2016 16:23:00 GMT
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/c2b47baf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2b47baf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2b47baf

Branch: refs/heads/cassandra-3.5
Commit: c2b47baf3fdae0750c3b66289b9e9b57d36e2381
Parents: 504760c 9b53d6a
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Mar 8 17:21:59 2016 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Mar 8 17:21:59 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                  | 3 +++
 src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2b47baf/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5b92143,9d4779a..384e7ea
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -52,10 -24,13 +52,13 @@@ Merged from 2.2
   * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
   * Fix paging on DISTINCT queries repeats result when first row in partition changes
     (CASSANDRA-10010)
 + * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
  Merged from 2.1:
+  * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
+  * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
+  * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
   * Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
   * Only notify if repair status changed (CASSANDRA-11172)
 - * Add partition key to TombstoneOverwhelmingException error message (CASSANDRA-10888)
   * Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
   * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714)
   * Fix incorrect warning in 'nodetool status' (CASSANDRA-10176)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2b47baf/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------


Mime
View raw message