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/87992c3a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87992c3a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87992c3a Branch: refs/heads/trunk Commit: 87992c3a4659b7813cd600452b84805a03c01b1d Parents: 57cbda0 3c8a097 Author: Marcus Eriksson <[email protected]> Authored: Wed Mar 2 14:22:11 2016 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Wed Mar 2 14:22:11 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/SSTableRewriter.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87992c3a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5d010c4,b77d811..a4b1aab --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -72,9 -40,9 +72,10 @@@ 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: + * 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/87992c3a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java ----------------------------------------------------------------------
