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/23f62962 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23f62962 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23f62962 Branch: refs/heads/cassandra-3.0 Commit: 23f629628ecb00bc997b88c9ffcc296be5d4f701 Parents: 58821ce d295c7c Author: Aleksey Yeschenko <[email protected]> Authored: Mon Feb 8 12:19:38 2016 +0000 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Feb 8 12:19:38 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 41 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23f62962/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0fb8f34,b0a5062..6302ce6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,7 +1,8 @@@ -2.2.6 +3.0.4 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) +Merged from 2.2.6 + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) * Gossiper#isEnabled is not thread safe (CASSANDRA-11116) - * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010) Merged from 2.1: * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113) http://git-wip-us.apache.org/repos/asf/cassandra/blob/23f62962/bin/cqlsh.py ----------------------------------------------------------------------
