Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8df6d4d4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8df6d4d4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8df6d4d4 Branch: refs/heads/trunk Commit: 8df6d4d4c60f865a09a93ff678ea5f6417465c29 Parents: 4bd4be8 dce4537 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Wed Jul 20 09:58:14 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Wed Jul 20 09:58:40 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ pylib/cqlshlib/test/__init__.py | 6 +++--- pylib/cqlshlib/test/cassconnect.py | 22 +++++++++++----------- pylib/cqlshlib/test/test_cqlsh_output.py | 14 +++++++------- 4 files changed, 23 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8df6d4d4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 780ea96,739c095..dac46ab --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,36 -1,5 +1,38 @@@ -3.0.9 +3.9 +Merged from 3.0: * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144) ++Merged from 2.2: ++ * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214) + +3.8 + * Fix hdr logging for single operation workloads (CASSANDRA-12145) + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) + * Increase size of flushExecutor thread pool (CASSANDRA-12071) + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034) + * Improve details in compaction log message (CASSANDRA-12080) + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911) + * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993) + * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579) + * Move skip_stop_words filter before stemming (CASSANDRA-12078) + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957) + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002) + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966) + * Add cross-DC latency metrics (CASSANDRA-11596) + * Allow terms in selection clause (CASSANDRA-10783) + * Add bind variables to trace (CASSANDRA-11719) + * Switch counter shards' clock to timestamps (CASSANDRA-9811) + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) + * Add Change-Data-Capture (CASSANDRA-8844) +Merged from 3.0: * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8df6d4d4/pylib/cqlshlib/test/test_cqlsh_output.py ----------------------------------------------------------------------
