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

[cassandra] branch cassandra-3.11 updated (d043217ff0 -> 9810922cf1)

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 d043217ff0 Merge branch 'cassandra-3.0' into cassandra-3.11
     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

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


---------------------------------------------------------------------
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 3.11.13, bump version to 3.11.14

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 6ad666e3a845d12af62083f0c05326e01491a98a
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Fri May 6 17:05:13 2022 +0200

    Prepare debian changelog for 3.11.13, bump version to 3.11.14
---
 CHANGES.txt      |  6 +++++-
 build.xml        |  2 +-
 debian/changelog | 10 ++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f409859eea..deae7d769e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+3.11.14
+Merged from 3.0:
+ * fsync TOC and digest files (CASSANDRA-10709)
+
+
 3.11.13
  * Upgrade jackson-databind to 2.13.2.2 (CASSANDRA-17556)
  * Upgrade slf4j to 1.7.25 (CASSANDRA-17474)
@@ -7,7 +12,6 @@
  * 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 36887647e6..5e6d54681e 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="3.11.13"/>
+    <property name="base.version" value="3.11.14"/>
     <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 cfef5fd860..ed34772e1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-cassandra (3.11.13) UNRELEASED; urgency=medium
+cassandra (3.11.14) UNRELEASED; urgency=medium
 
   * New release
 
- -- Mick Semb Wever <mc...@apache.org>  Mon, 07 Feb 2022 13:55:35 +0100
+ -- Mick Semb Wever <mc...@apache.org>  Fri, 06 May 2022 17:04:47 +0200
+
+cassandra (3.11.13) unstable; urgency=medium
+
+  * New release
+
+ -- Mick Semb Wever <mc...@apache.org>  Fri, 06 May 2022 17:04:47 +0200
 
 cassandra (3.11.12) unstable; urgency=medium
 


---------------------------------------------------------------------
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.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 9810922cf1e1a4f63a4f7e0617a9fefefcb08fbe
Merge: 6ad666e3a8 f20f17b4a7
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Sat May 14 01:30:42 2022 +0200

    Merge branch 'cassandra-3.0' into cassandra-3.11



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