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 2020/02/26 23:14:44 UTC
[cassandra] branch cassandra-3.11 updated (1b29401 -> ef7e171)
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 1b29401 Merge branch 'cassandra-3.0' into cassandra-3.11
new e37f77d Fix CHANGES merged from notes
new afc1ba3 Merge branch 'cassandra-3.0' into cassandra-3.11
new ef7e171 Fix CHANGES merged from notes
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 ++----
1 file changed, 2 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: 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 afc1ba3f1d47bb399e16cf61fe4e7092d994a791
Merge: 1b29401 e37f77d
Author: Michael Shuler <ms...@apache.org>
AuthorDate: Wed Feb 26 17:12:03 2020 -0600
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --cc CHANGES.txt
index a4a6c12,9adc461..0261e4f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,9 +1,17 @@@
-3.0.21
+3.11.7
+Merged from 3.0:
* Run evictFromMembership in GossipStage (CASSANDRA-15592)
- Merged from 2.2
+ Merged from 2.2:
* Allow EXTRA_CLASSPATH to work on tar/source installations (CASSANDRA-15567)
-3.0.20
+
+3.11.6
+ * Fix bad UDT sstable metadata serialization headers written by C* 3.0 on upgrade and in sstablescrub (CASSANDRA-15035)
+ * Fix nodetool compactionstats showing extra pending task for TWCS - patch implemented (CASSANDRA-15409)
+ * Fix SELECT JSON formatting for the "duration" type (CASSANDRA-15075)
+ * Fix LegacyLayout to have same behavior as 2.x when handling unknown column names (CASSANDRA-15081)
+ * Update nodetool help stop output (CASSANDRA-15401)
+Merged from 3.0:
* Run in-jvm upgrade dtests in circleci (CASSANDRA-15506)
* Include updates to static column in mutation size calculations (CASSANDRA-15293)
* Fix point-in-time recoevery ignoring timestamp of updates to static columns (CASSANDRA-15292)
@@@ -29,10 -21,8 +29,9 @@@
* Make sure index summary redistribution does not start when compactions are paused (CASSANDRA-15265)
* Ensure legacy rows have primary key livenessinfo when they contain illegal cells (CASSANDRA-15365)
* Fix race condition when setting bootstrap flags (CASSANDRA-14878)
+Merged from 2.2:
* Fix NativeLibrary.tryOpenDirectory callers for Windows (CASSANDRA-15426)
-
- 2.2.16
+ Merged from 2.2:
* Fix SELECT JSON output for empty blobs (CASSANDRA-15435)
* In-JVM DTest: Set correct internode message version for upgrade test (CASSANDRA-15371)
* In-JVM DTest: Support NodeTool in dtest (CASSANDRA-15429)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 02/02: Fix CHANGES merged from notes
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 ef7e171f0a74f31f6a7a518cd4a9a1133f32c7e5
Author: Michael Shuler <ms...@apache.org>
AuthorDate: Wed Feb 26 17:12:50 2020 -0600
Fix CHANGES merged from notes
---
CHANGES.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 0261e4f..7224b24 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -29,7 +29,6 @@ Merged from 3.0:
* Make sure index summary redistribution does not start when compactions are paused (CASSANDRA-15265)
* Ensure legacy rows have primary key livenessinfo when they contain illegal cells (CASSANDRA-15365)
* Fix race condition when setting bootstrap flags (CASSANDRA-14878)
-Merged from 2.2:
* Fix NativeLibrary.tryOpenDirectory callers for Windows (CASSANDRA-15426)
Merged from 2.2:
* Fix SELECT JSON output for empty blobs (CASSANDRA-15435)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org