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/ac8c8b21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac8c8b21 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac8c8b21 Branch: refs/heads/trunk Commit: ac8c8b213c6a02de1b547cd537bf9058e851bfdc Parents: babf30d c4bd6d2 Author: Jason Brown <[email protected]> Authored: Tue Feb 23 14:38:18 2016 -0800 Committer: Jason Brown <[email protected]> Committed: Tue Feb 23 14:39:53 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 3 +- .../cassandra/gms/FailureDetectorTest.java | 85 ++++++++++++++++++++ 3 files changed, 87 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac8c8b21/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6ad7e1f,9ca2f80..361eedc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -61,8 -33,8 +61,9 @@@ 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) Merged from 2.1: + * 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) * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714)
