You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ms...@apache.org on 2019/10/29 21:18:03 UTC

[cassandra] branch cassandra-3.11 updated (9c1925a -> fb50d82)

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

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


    from 9c1925a  Merge branch 'cassandra-3.0' into cassandra-3.11
     new a593d7b  Increment version to 2.2.16
     new 9c0dfab  Merge branch 'cassandra-2.2' into cassandra-3.0
     new ae366ba  Increment version to 3.0.20
     new 6e67f4a  Merge branch 'cassandra-3.0' into cassandra-3.11
     new fb50d82  Increment version to 3.11.6

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:
 NEWS.txt         | 8 ++++++++
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)


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


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

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

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

commit 6e67f4ac408e6c0465ad2d340ef9f63299eb4126
Merge: 9c1925a ae366ba
Author: Michael Shuler <ms...@apache.org>
AuthorDate: Tue Oct 29 16:12:16 2019 -0500

    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


[cassandra] 02/02: Increment version to 3.11.6

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

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

commit fb50d823b6bb758952f1b7cdb51665b40a88bc7c
Author: Michael Shuler <ms...@apache.org>
AuthorDate: Tue Oct 29 16:15:49 2019 -0500

    Increment version to 3.11.6
---
 NEWS.txt         | 8 ++++++++
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/NEWS.txt b/NEWS.txt
index 68dbeb7..01a4b39 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -42,6 +42,14 @@ restore snapshots created with the previous major version using the
 'sstableloader' tool. You can upgrade the file format of your snapshots
 using the provided 'sstableupgrade' tool.
 
+3.11.6
+======
+
+Upgrading
+---------
+    - Nothing specific to this release, but please see previous upgrading sections,
+      especially if you are upgrading from 3.0.
+
 3.11.5
 ======
 
diff --git a/build.xml b/build.xml
index 557cc07..e81818e 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="3.11.5"/>
+    <property name="base.version" value="3.11.6"/>
     <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 bf1d4d3..14b9b78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.11.6) UNRELEASED; urgency=medium
+
+  * New release
+
+ -- Michael Shuler <ms...@apache.org>  Tue, 29 Oct 2019 16:14:42 -0500
+
 cassandra (3.11.5) unstable; urgency=medium
 
   * New release


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