This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 461ae2b2cabfcd94076b4ad1f97f8257e3a8b364
Merge: 95197ce b2b1b46
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Wed Feb 26 11:47:26 2020 -0600
Merge branch 'cassandra-2.2' into cassandra-3.0
CHANGES.txt | 5 ++++-
bin/cassandra | 1 +
bin/cassandra.in.sh | 3 +++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index e2614ec,9ecfcb4..aa00edd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,15 +1,68 @@@
-2.2.17
+3.0.21
+ * Run evictFromMembership in GossipStage (CASSANDRA-15592)
++Merged from 2.2
+ * Allow EXTRA_CLASSPATH to work on tar/source installations (CASSANDRA-15567)
+3.0.20
+ * 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)
+ * GC logs are also put under $CASSANDRA_LOG_DIR (CASSANDRA-14306)
+ * Fix sstabledump's position key value when partitions have multiple rows
(CASSANDRA-14721)
+ * Avoid over-scanning data directories in LogFile.verify() (CASSANDRA-15364)
+ * Bump generations and document changes to system_distributed and
system_traces in 3.0, 3.11
+ (CASSANDRA-15441)
+ * Fix system_traces creation timestamp; optimise system keyspace upgrades
(CASSANDRA-15398)
+ * Fix various data directory prefix matching issues (CASSANDRA-13974)
+ * Minimize clustering values in metadata collector (CASSANDRA-15400)
+ * Avoid over-trimming of results in mixed mode clusters (CASSANDRA-15405)
+ * validate value sizes in LegacyLayout (CASSANDRA-15373)
+ * Ensure that tracing doesn't break connections in 3.x/4.0 mixed mode by
default (CASSANDRA-15385)
+ * 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)
+ * Fix NativeLibrary.tryOpenDirectory callers for Windows (CASSANDRA-15426)
- Merged from 2.2
++
+ 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
+ * In-JVM DTest: Support NodeTool in dtest (CASSANDRA-15429)
-2.2.15
+3.0.19
+ * Add ability to cap max negotiable protocol version (CASSANDRA-15193)
+ * Gossip tokens on startup if available (CASSANDRA-15335)
+ * Fix resource leak in CompressedSequentialWriter (CASSANDRA-15340)
+ * Fix merge which reverted CASSANDRA-14993 (CASSANDRA-15289)
+ * Fix LegacyLayout RangeTombstoneList IndexOutOfBoundsException when
upgrading and RangeTombstone bounds are asymmetric (CASSANDRA-15172)
+ * Fix NPE when using allocate_tokens_for_keyspace on new DC/rack
(CASSANDRA-14952)
+ * Filter sstables earlier when running cleanup (CASSANDRA-15100)
+ * Use mean row count instead of mean column count for index selectivity
calculation (CASSANDRA-15259)
+ * Avoid updating unchanged gossip states (CASSANDRA-15097)
+ * Prevent recreation of previously dropped columns with a different kind
(CASSANDRA-14948)
+ * Prevent client requests from blocking on executor task queue
(CASSANDRA-15013)
+ * Toughen up column drop/recreate type validations (CASSANDRA-15204)
+ * LegacyLayout should handle paging states that cross a collection column
(CASSANDRA-15201)
+ * Prevent RuntimeException when username or password is empty/null
(CASSANDRA-15198)
+ * Multiget thrift query returns null records after digest mismatch
(CASSANDRA-14812)
+ * Skipping illegal legacy cells can break reverse iteration of indexed
partitions (CASSANDRA-15178)
+ * Handle paging states serialized with a different version than the
session's (CASSANDRA-15176)
+ * Throw IOE instead of asserting on unsupporter peer versions
(CASSANDRA-15066)
+ * Update token metadata when handling MOVING/REMOVING_TOKEN events
(CASSANDRA-15120)
+ * Add ability to customize cassandra log directory using $CASSANDRA_LOG_DIR
(CASSANDRA-15090)
+ * Skip cells with illegal column names when reading legacy sstables
(CASSANDRA-15086)
+ * Fix assorted gossip races and add related runtime checks (CASSANDRA-15059)
+ * Fix mixed mode partition range scans with limit (CASSANDRA-15072)
+ * cassandra-stress works with frozen collections: list and set
(CASSANDRA-14907)
+ * For nodetool listsnapshots output, put spaces between columns, and
increase snapshot padding (CASSANDRA-14876)
+ * Fix handling FS errors on writing and reading flat files - LogTransaction
and hints (CASSANDRA-15053)
+ * Avoid double closing the iterator to avoid overcounting the number of
requests (CASSANDRA-15058)
+ * Improve `nodetool status -r` speed (CASSANDRA-14847)
+ * Improve merkle tree size and time on heap (CASSANDRA-14096)
+ * Add missing commands to nodetool-completion (CASSANDRA-14916)
+ * Anti-compaction temporarily corrupts sstable state for readers
(CASSANDRA-15004)
+ Merged from 2.2:
* Catch non-IOException in FileUtils.close to make sure that all resources
are closed (CASSANDRA-15225)
* Handle exceptions during authentication/authorization (CASSANDRA-15041)
- * Fix JDK7 compatibility broken in cassandra-2.2 (CASSANDRA-15050)
* Support cross version messaging in in-jvm upgrade dtests (CASSANDRA-15078)
* Fix index summary redistribution cancellation (CASSANDRA-15045)
* Refactor Circle CI configuration (CASSANDRA-14806)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
