cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject [cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk
Date Mon, 31 Aug 2020 19:04:17 GMT
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 fc87d3e0ab7708e26f69df1f4a9c51707886d2b3
Merge: 56eadf2 ca37de0
Author: Mick Semb Wever <mck@apache.org>
AuthorDate: Mon Aug 31 21:01:25 2020 +0200

    Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt      | 2 ++
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 7db0191,0a56c4f..a7ed819
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,8 +1,30 @@@
 -3.11.9
++4.0-beta3
+ 
 -3.11.8
 +4.0-beta2
 + * Add addition incremental repair visibility to nodetool repair_admin (CASSANDRA-14939)
 + * Always access system properties and environment variables via the new CassandraRelevantProperties
and CassandraRelevantEnv classes (CASSANDRA-15876)
 + * Remove deprecated HintedHandOffManager (CASSANDRA-15939)
 + * Prevent repair from overrunning compaction (CASSANDRA-15817)
 + * fix cqlsh COPY functions in Python 3.8 on Mac (CASSANDRA-16053)
 + * Strip comment blocks from cqlsh input before processing statements (CASSANDRA-15802)
 + * Fix unicode chars error input (CASSANDRA-15990)
 + * Improved testability for CacheMetrics and ChunkCacheMetrics (CASSANDRA-15788)
 + * Handle errors in StreamSession#prepare (CASSANDRA-15852)
 + * FQL replay should have options to ignore DDL statements (CASSANDRA-16039)
 + * Remove COMPACT STORAGE internals (CASSANDRA-13994)
 + * Make TimestampSerializer accept fractional seconds of varying precision (CASSANDRA-15976)
 + * Improve cassandra-stress logging when using a profile file that doesn't exist (CASSANDRA-14425)
 + * Improve logging for socket connection/disconnection (CASSANDRA-15980)
 + * Throw FSWriteError upon write failures in order to apply DiskFailurePolicy (CASSANDRA-15928)
 + * Forbid altering UDTs used in partition keys (CASSANDRA-15933)
 + * Fix version parsing logic when upgrading from 3.0 (CASSANDRA-15973)
 + * Optimize NoSpamLogger use in hot paths (CASSANDRA-15766)
 + * Verify sstable components on startup (CASSANDRA-15945)
 + * Resolve JMX output inconsistencies from CASSANDRA-7544 storage-port-configurable-per-node
(CASSANDRA-15937)
 +Merged from 3.11:
   * Correctly interpret SASI's `max_compaction_flush_memory_in_mb` setting in megabytes not
bytes (CASSANDRA-16071)
   * Fix short read protection for GROUP BY queries (CASSANDRA-15459)
 + * stop_paranoid disk failure policy is ignored on CorruptSSTableException after node is
up (CASSANDRA-15191)
   * Frozen RawTuple is not annotated with frozen in the toString method (CASSANDRA-15857)
  Merged from 3.0:
   * Fix gossip shutdown order (CASSANDRA-15816)
diff --cc build.xml
index 66a0d2e,a2937e2..e77dd0b
--- a/build.xml
+++ b/build.xml
@@@ -25,7 -25,7 +25,7 @@@
      <property name="debuglevel" value="source,lines,vars"/>
  
      <!-- default version and SCM information -->
-     <property name="base.version" value="4.0-beta2"/>
 -    <property name="base.version" value="3.11.9"/>
++    <property name="base.version" value="4.0-beta3"/>
      <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 02964e9,2b46981..400ca51
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,10 @@@
 -cassandra (3.11.9) unstable; urgency=medium
++cassandra (4.0~beta3) unstable; urgency=medium
+ 
+   * New release
+ 
+  -- 
+ 
 -cassandra (3.11.8) unstable; urgency=medium
 +cassandra (4.0~beta2) unstable; urgency=medium
  
    * New release
  


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


Mime
View raw message