Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17d1b1b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17d1b1b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17d1b1b0 Branch: refs/heads/trunk Commit: 17d1b1b0438c07778b34f6100c9c1fec1b4b210a Parents: 719f584 c2b47ba Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Mar 8 17:22:14 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Mar 8 17:22:14 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/17d1b1b0/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c88ae54,384e7ea..72ce859 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -84,9 -52,11 +84,12 @@@ 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) Support timezone conversion using pytz (CASSANDRA-10397) * 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) * Use logback setting for 'cassandra -v' command (CASSANDRA-10767) http://git-wip-us.apache.org/repos/asf/cassandra/blob/17d1b1b0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java ----------------------------------------------------------------------
