[cassandra] branch cassandra-3.0 updated: Fix CHANGES merged from notes

[ms...@apache.org]

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

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


The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
     new e37f77d  Fix CHANGES merged from notes
e37f77d is described below

commit e37f77d41b42344905d1f3e27bee963fa417fa68
Author: Michael Shuler <ms...@apache.org>
AuthorDate: Wed Feb 26 17:11:42 2020 -0600

    Fix CHANGES merged from notes
---
 CHANGES.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index aa00edd..9adc461 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,6 @@
 3.0.21
  * 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
@@ -22,8 +22,7 @@ Merged from 2.2
  * Ensure legacy rows have primary key livenessinfo when they contain illegal cells (CASSANDRA-15365)
  * Fix race condition when setting bootstrap flags (CASSANDRA-14878)
  * 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