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/dce45374 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dce45374 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dce45374 Branch: refs/heads/trunk Commit: dce4537410d66a3cbd24b2e581737b849e011917 Parents: 0297cbe e8186fe Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Wed Jul 20 09:56:12 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Wed Jul 20 09:56:12 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/test/__init__.py | 6 +++--- pylib/cqlshlib/test/cassconnect.py | 22 +++++++++++----------- pylib/cqlshlib/test/test_cqlsh_output.py | 14 +++++++------- 4 files changed, 22 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dce45374/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f205e0b,ffd92b5..739c095 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,8 +1,22 @@@ -2.2.8 +3.0.9 + * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144) + * Fix paging logic for deleted partitions with static columns (CASSANDRA-12107) + * Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393) + * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147) + * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315) + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733) + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098) + * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996) + * Always select the live sstables when getting sstables in bounds (CASSANDRA-11944) + * Fix column ordering of results with static columns for Thrift requests in + a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of + those static columns in query results (CASSANDRA-12123) + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090) + * Fix EOF exception when altering column type (CASSANDRA-11820) +Merged from 2.2: + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214) * Synchronize ThriftServer::stop() (CASSANDRA-12105) * Use dedicated thread for JMX notifications (CASSANDRA-12146) - * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143) * Improve streaming synchronization and fault tolerance (CASSANDRA-11414) * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973) Merged from 2.1: http://git-wip-us.apache.org/repos/asf/cassandra/blob/dce45374/pylib/cqlshlib/test/test_cqlsh_output.py ---------------------------------------------------------------------- diff --cc pylib/cqlshlib/test/test_cqlsh_output.py index f867312,60699f3..85ce626 --- a/pylib/cqlshlib/test/test_cqlsh_output.py +++ b/pylib/cqlshlib/test/test_cqlsh_output.py @@@ -631,9 -630,9 +631,9 @@@ class TestCqlshOutput(BaseTestCase) AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 AND read_repair_chance = 0.0 - AND speculative_retry = '99.0PERCENTILE'; + AND speculative_retry = '99PERCENTILE'; - """ % quote_name(get_test_keyspace())) + """ % quote_name(get_keyspace())) with testrun_cqlsh(tty=True, cqlver=cqlsh.DEFAULT_CQLVER) as c: for cmdword in ('describe table', 'desc columnfamily'):
