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:35 UTC
[cassandra] branch cassandra-3.11 updated (ec5e242 -> 3854348)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from ec5e242 Merge branch cassandra-3.0 into cassandra-3.11
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
new 3854348 Merge branch 'cassandra-3.0' into cassandra-3.11
The 3 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 | 8 +++++---
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 12 insertions(+), 4 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-3.0' into cassandra-3.11
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.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 385434881fd7dbd8a678189e5399bf23fb855022
Merge: ec5e242 b6ef9b2
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Wed Nov 4 12:42:41 2020 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 8 +++++---
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 12 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index 2501fcb,696e50f..e46731b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,8 +1,16 @@@
-3.0.24:
++3.11.10
++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.0.23:
+3.11.9
+ * Synchronize Keyspace instance store/clear (CASSANDRA-16210)
+ * 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)
+ * Make sure LCS handles duplicate sstable added/removed notifications correctly (CASSANDRA-14103)
+Merged from 3.0:
- 3.0.23:
- * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
- * 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)
diff --cc build.xml
index 6246386,1851ee9..5a8040e
--- 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.11.9"/>
- <property name="base.version" value="3.0.24"/>
++ <property name="base.version" value="3.11.10"/>
<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 133f3ac,71f1ac3..3dae39e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,10 @@@
-cassandra (3.0.24) UNRELEASED; urgency=medium
++cassandra (3.11.10) UNRELEASED; urgency=medium
+
+ * New release
+
- -- Mick Semb Wever <mc...@apache.org> Thu, 29 Oct 2020 12:03:40 +0100
++ -- Mick Semb Wever <mc...@apache.org> Thu, 29 Oct 2020 12:32:12 +0100
+
-cassandra (3.0.23) unstable; urgency=medium
+cassandra (3.11.9) unstable; urgency=medium
* New release
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org