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 2022/05/13 23:35:41 UTC

[cassandra] branch cassandra-4.0 updated (ac0266be69 -> 4b93dbcf84)

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

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


    from ac0266be69 Merge branch 'cassandra-3.11' into cassandra-4.0
     new 756683c7cf Prepare debian changelog for 4.0.4, bump version to 4.0.5
     new 6ad666e3a8 Prepare debian changelog for 3.11.13, bump version to 3.11.14
     new f20f17b4a7 Prepare debian changelog for 3.0.27, bump version to 3.0.28
     new 9810922cf1 Merge branch 'cassandra-3.0' into cassandra-3.11
     new 4b93dbcf84 Merge branch 'cassandra-3.11' into cassandra-4.0

The 5 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      |  7 ++++++-
 build.xml        |  2 +-
 debian/changelog | 10 ++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)


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


[cassandra] 02/02: Merge branch 'cassandra-3.11' into cassandra-4.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-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 4b93dbcf84f0a513adb30f475beba499ee632b90
Merge: 756683c7cf 9810922cf1
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Sat May 14 01:30:55 2022 +0200

    Merge branch 'cassandra-3.11' into cassandra-4.0



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


[cassandra] 01/02: Prepare debian changelog for 4.0.4, bump version to 4.0.5

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

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

commit 756683c7cf1199b1a2af870b2f033b40cbd0bb6e
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Fri May 6 18:38:54 2022 +0200

    Prepare debian changelog for 4.0.4, bump version to 4.0.5
---
 CHANGES.txt      |  7 ++++++-
 build.xml        |  2 +-
 debian/changelog | 10 ++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 75a312d637..eff3c638a5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,9 @@
+4.0.5
+Merged from 3.11.13:
+Merged from 3.0:
+ * fsync TOC and digest files (CASSANDRA-10709)
+
+
 4.0.4
  * Optimise BTree build,update and transform operations (CASSANDRA-15510)
  * Clean up schema migration coordinator and tests (CASSANDRA-17533)
@@ -26,7 +32,6 @@ Merged from 3.11.13:
  * Validate existence of DCs when repairing (CASSANDRA-17407)
  * dropping of a materialized view creates a snapshot with dropped- prefix (CASSANDRA-17415)
 Merged from 3.0:
- * fsync TOC and digest files (CASSANDRA-10709)
  * Fix URISyntaxException in nodetool with updated Java (CASSANDRA-17581)
  * Schema mutations may not be completed on drain (CASSANDRA-17524)
  * Fix data corruption in AbstractCompositeType due to static boolean byte buffers (CASSANDRA-14752)
diff --git a/build.xml b/build.xml
index 67cfc242ac..ee7bc3b689 100644
--- a/build.xml
+++ b/build.xml
@@ -33,7 +33,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="4.0.4"/>
+    <property name="base.version" value="4.0.5"/>
     <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 --git a/debian/changelog b/debian/changelog
index d6f69fd636..d4c033e691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-cassandra (4.0.4) UNRELEASED; urgency=medium
+cassandra (4.0.5) UNRELEASED; urgency=medium
 
   * New release
 
- -- Mick Semb Wever <mc...@apache.org>  Sun, 13 Feb 2022 22:37:37 +0100
+ -- Mick Semb Wever <mc...@apache.org>  Fri, 06 May 2022 18:38:33 +0200
+
+cassandra (4.0.4) unstable; urgency=medium
+
+  * New release
+
+ -- Mick Semb Wever <mc...@apache.org>  Fri, 06 May 2022 18:38:33 +0200
 
 cassandra (4.0.3) unstable; urgency=medium
 


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