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

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

commit 1b29401e2a7c822e32567c5b062032f7e9f85484
Merge: aaef02e 461ae2b
Author: Brandon Williams <[email protected]>
AuthorDate: Wed Feb 26 11:48:10 2020 -0600

    Merge branch 'cassandra-3.0' into cassandra-3.11

 CHANGES.txt         | 5 +++++
 bin/cassandra       | 1 +
 bin/cassandra.in.sh | 3 +++
 3 files changed, 9 insertions(+)

diff --cc CHANGES.txt
index a8baa44,aa00edd..a4a6c12
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,9 +1,17 @@@
 -3.0.21
 +3.11.7
 +Merged from 3.0:
   * Run evictFromMembership in GossipStage (CASSANDRA-15592)
+ 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)
@@@ -27,7 -21,9 +29,10 @@@
   * 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
   * 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: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to