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/02/12 03:17:17 UTC
[cassandra] branch cassandra-3.11 updated (9199e59 -> 123113f)
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 9199e59 Merge branch 'cassandra-3.0' into cassandra-3.11
new ce6bcaa Update version to 2.2.15
new d109e5c Merge branch 'cassandra-2.2' into cassandra-3.0
new 229f8b3 Update version to 3.0.19
new a77f978 Merge branch 'cassandra-3.0' into cassandra-3.11
new 123113f Update version to 3.11.5
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 | 4 +++-
NEWS.txt | 8 ++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
4 files changed, 18 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 02/02: Update version to 3.11.5
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 123113f7b887370a248669ee0db6fdf13df0146e
Author: Michael Shuler <ms...@apache.org>
AuthorDate: Mon Feb 11 21:16:03 2019 -0600
Update version to 3.11.5
---
CHANGES.txt | 4 +++-
NEWS.txt | 8 ++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
4 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a2afa4..ffa90ed 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,8 @@
3.11.5
-Merged from 3.0:
+ Merged from 3.0:
* Anti-compaction temporarily corrupts sstable state for readers (CASSANDRA-15004)
+ Merged from 2.2:
+ * Multi-version in-JVM dtests (CASSANDRA-14937)
3.11.4
diff --git a/NEWS.txt b/NEWS.txt
index ea53c36..3b44ae3 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.5
+======
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see previous upgrading sections,
+ especially if you are upgrading from 2.2.
+
3.11.4
======
diff --git a/build.xml b/build.xml
index cbf5289..ffa83da 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.4"/>
+ <property name="base.version" value="3.11.5"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
diff --git a/debian/changelog b/debian/changelog
index ba5efef..b9775bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.11.5) unstable; urgency=medium
+
+ * New release
+
+ -- Michael Shuler <ms...@apache.org> Mon, 11 Feb 2019 21:12:23 -0600
+
cassandra (3.11.4) unstable; urgency=medium
* New release
---------------------------------------------------------------------
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 a77f978a08d25f8fac7ad72fe9fa60c0c272fae6
Merge: 9199e59 229f8b3
Author: Michael Shuler <ms...@apache.org>
AuthorDate: Mon Feb 11 21:09:50 2019 -0600
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