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:33 UTC

[cassandra] branch cassandra-3.0 updated (5a87472 -> b6ef9b2)

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

mck pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 5a87472  Merge branch cassandra-2.2 into cassandra-3.0
     new 140048f  Increment versions to 2.2.20, 3.0.24, 3.11.10, 4.0-beta4
     new b6ef9b2  Merge branch 'cassandra-2.2' into cassandra-3.0

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt      | 4 +++-
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 3 files changed, 10 insertions(+), 2 deletions(-)


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


[cassandra] 01/01: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by mc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit b6ef9b22f2857169f65f3d8ef91d338fa360ad00
Merge: 5a87472 140048f
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Wed Nov 4 12:39:33 2020 +0100

    Merge branch 'cassandra-2.2' into cassandra-3.0

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

diff --cc CHANGES.txt
index 80f5d58,166cca4..696e50f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,12 +1,30 @@@
- 3.0.23:
 -2.2.20
++3.0.24:
 + * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
 + * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
+ 
 -
 -2.2.19
++3.0.23:
 + * 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)
 + * 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)
 + * Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160)
 +Merged from 2.2:
   * Package tools/bin scripts as executable (CASSANDRA-16151)
 - * Fix ExceptionInInitializerError when data_file_directories is not set (CASSANDRA-16008)
   * Fixed a NullPointerException when calling nodetool enablethrift (CASSANDRA-16127)
  
 -2.2.18
 +3.0.22:
 + * Fix gossip shutdown order (CASSANDRA-15816)
 + * Remove broken 'defrag-on-read' optimization (CASSANDRA-15432)
 + * Check for endpoint collision with hibernating nodes (CASSANDRA-14599)
 + * Operational improvements and hardening for replica filtering protection (CASSANDRA-15907)
 + * stop_paranoid disk failure policy is ignored on CorruptSSTableException after node is up (CASSANDRA-15191)
 + * 3.x fails to start if commit log has range tombstones from a column which is also deleted (CASSANDRA-15970)
 + * Forbid altering UDTs used in partition keys (CASSANDRA-15933)
 + * Fix empty/null json string representation (CASSANDRA-15896)
 + * Handle difference in timestamp precision between java8 and java11 in LogFIle.java (CASSANDRA-16050)
 +Merged from 2.2:
   * Fix CQL parsing of collections when the column type is reversed (CASSANDRA-15814)
  Merged from 2.1:
   * Only allow strings to be passed to JMX authentication (CASSANDRA-16077)
diff --cc build.xml
index 76c8867,617a993..1851ee9
--- 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="3.0.23"/>
 -    <property name="base.version" value="2.2.20"/>
++    <property name="base.version" value="3.0.24"/>
      <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 2e2a521,79753aa..71f1ac3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,10 @@@
 -cassandra (2.2.20) UNRELEASED; urgency=medium
++cassandra (3.0.24) UNRELEASED; urgency=medium
+ 
+   * New release
+ 
 - -- Mick Semb Wever <mc...@apache.org>  Thu, 29 Oct 2020 11:34:29 +0100
++ -- Mick Semb Wever <mc...@apache.org>  Thu, 29 Oct 2020 12:03:40 +0100
+ 
 -cassandra (2.2.19) unstable; urgency=medium
 +cassandra (3.0.23) unstable; urgency=medium
  
    * New release
  


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