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 <mshu...@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-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
