You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2020/11/04 12:27:38 UTC

[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit f45b1edc918877aa285c42d86a23911656c014aa
Merge: 93c2d76 3854348
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Wed Nov 4 12:49:22 2020 +0100

    Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt      | 5 ++++-
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --cc CHANGES.txt
index 3586d95,e46731b..bf626ab
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,43 -1,19 +1,46 @@@
 -3.11.10
 +4.0-beta4
 + * Produce consistent tombstone for reads to avoid digest mistmatch (CASSANDRA-15369)
 + * Fix SSTableloader issue when restoring a table named backups (CASSANDRA-16235)
 + * Invalid serialized size for responses caused by increasing message time by 1ms which caused extra bytes in size calculation (CASSANDRA-16103)
 + * Throw BufferOverflowException from DataOutputBuffer for better visibility (CASSANDRA-16214)
++Merged from 3.11:
+ Merged from 3.0:
 - * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
+  * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
+ 
 -3.11.9
 - * Synchronize Keyspace instance store/clear (CASSANDRA-16210)
 +4.0-beta3
 + * Segregate Network and Chunk Cache BufferPools and Recirculate Partially Freed Chunks (CASSANDRA-15229)
 + * Fail truncation requests when they fail on a replica (CASSANDRA-16208)
 + * Move compact storage validation earlier in startup process (CASSANDRA-16063)
 + * Fix ByteBufferAccessor cast exceptions are thrown when trying to query a virtual table (CASSANDRA-16155)
 + * Consolidate node liveness check for forced repair (CASSANDRA-16113)
 + * Use unsigned short in ValueAccessor.sliceWithShortLength (CASSANDRA-16147)
 + * Abort repairs when getting a truncation request (CASSANDRA-15854)
 + * Remove bad assert when getting active compactions for an sstable (CASSANDRA-15457)
 + * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 + * Prevent NPE in StreamMessage in type lookup (CASSANDRA-16131)
 + * Avoid invalid state transition exception during incremental repair (CASSANDRA-16067)
 + * Allow zero padding in timestamp serialization (CASSANDRA-16105)
 + * Add byte array backed cells (CASSANDRA-15393)
 + * Correctly handle pending ranges with adjacent range movements (CASSANDRA-14801)
 + * Avoid adding locahost when streaming trivial ranges (CASSANDRA-16099)
 + * Add nodetool getfullquerylog (CASSANDRA-15988)
 + * Fix yaml format and alignment in tpstats (CASSANDRA-11402)
 + * Avoid trying to keep track of RTs for endpoints we won't write to during read repair (CASSANDRA-16084)
 + * When compaction gets interrupted, the exception should include the compactionId (CASSANDRA-15954)
 + * Make Table/Keyspace Metric Names Consistent With Each Other (CASSANDRA-15909)
 + * Mutating sstable component may race with entire-sstable-streaming(ZCS) causing checksum validation failure (CASSANDRA-15861)
 + * NPE thrown while updating speculative execution time if keyspace is removed during task execution (CASSANDRA-15949)
 + * Show the progress of data streaming and index build (CASSANDRA-15406)
 + * Add flag to disable chunk cache and disable by default (CASSANDRA-16036)
 + * Upgrade to snakeyaml >= 1.26 version for CVE-2017-18640 fix (CASSANDRA-16150)
 +Merged from 3.11:
   * Fix ColumnFilter to avoid querying cells of unselected complex columns (CASSANDRA-15977)
   * Fix memory leak in CompressedChunkReader (CASSANDRA-15880)
   * Don't attempt value skipping with mixed version cluster (CASSANDRA-15833)
 - * Avoid failing compactions with very large partitions (CASSANDRA-15164)
 + * Use IF NOT EXISTS for index and UDT create statements in snapshot schema files (CASSANDRA-13935)
   * Make sure LCS handles duplicate sstable added/removed notifications correctly (CASSANDRA-14103)
  Merged from 3.0:
-  * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
 - * Fix OOM when terminating repair session (CASSANDRA-15902)
   * Avoid marking shutting down nodes as up after receiving gossip shutdown message (CASSANDRA-16094)
 - * Check SSTables for latest version before dropping compact storage (CASSANDRA-16063)
   * Handle unexpected columns due to schema races (CASSANDRA-15899)
   * Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160)
  Merged from 2.2:
diff --cc build.xml
index 564c967,5a8040e..a02c566
--- a/build.xml
+++ b/build.xml
@@@ -27,7 -25,7 +27,7 @@@
      <property name="debuglevel" value="source,lines,vars"/>
  
      <!-- default version and SCM information -->
-     <property name="base.version" value="4.0-beta3"/>
 -    <property name="base.version" value="3.11.10"/>
++    <property name="base.version" value="4.0-beta4"/>
      <property name="scm.connection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
      <property name="scm.developerConnection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
      <property name="scm.url" value="https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/>
diff --cc debian/changelog
index dbbde83,3dae39e..a366395
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,10 @@@
 -cassandra (3.11.10) UNRELEASED; urgency=medium
++cassandra (4.0~beta4) UNRELEASED; urgency=medium
+ 
+   * New release
+ 
 - -- Mick Semb Wever <mc...@apache.org>  Thu, 29 Oct 2020 12:32:12 +0100
++ -- Mick Semb Wever <mc...@apache.org>  Thu, 29 Oct 2020 12:59:30 +0100
+ 
 -cassandra (3.11.9) unstable; urgency=medium
 +cassandra (4.0~beta3) unstable; urgency=medium
  
    * New release
  


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org