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

edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit ce4ae43a310a809fb0c82a7f48001a0f8206e156
Merge: 063a37699c 2eac2590bf
Author: Ekaterina Dimitrova <ekaterina.dimitr...@datastax.com>
AuthorDate: Thu Jun 2 15:33:54 2022 -0400

    Merge branch 'cassandra-4.1' into trunk

 CHANGES.txt                                          |  1 +
 NEWS.txt                                             |  3 +++
 .../cassandra/pages/operating/bulk_loading.adoc      |  6 +++++-
 .../cassandra/io/sstable/CQLSSTableWriter.java       | 20 ++++++++++++++++++++
 .../io/sstable/CQLSSTableWriterLongTest.java         |  2 +-
 .../cassandra/io/sstable/CQLSSTableWriterTest.java   | 12 ++++++------
 .../cassandra/io/sstable/SSTableLoaderTest.java      |  2 +-
 7 files changed, 37 insertions(+), 9 deletions(-)

diff --cc CHANGES.txt
index ced41dea6c,5540de8433..31715d320b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,14 +1,15 @@@
 -4.1-alpha2
 +4.2
 + * When a node is bootstrapping it gets the whole gossip state but applies in 
random order causing some cases where StorageService will fail causing an 
instance to not show up in TokenMetadata (CASSANDRA-17676)
 + * Add CQLSH command SHOW REPLICAS (CASSANDRA-17577)
 + * Add guardrail to allow disabling of SimpleStrategy (CASSANDRA-17647)
 + * Change default directory permission to 750 in packaging (CASSANDRA-17470)
 + * Adding support for TLS client authentication for internode communication 
(CASSANDRA-17513)
 + * Add new CQL function maxWritetime (CASSANDRA-17425)
 + * Add guardrail for ALTER TABLE ADD / DROP / REMOVE column operations 
(CASSANDRA-17495)
 + * Rename DisableFlag class to EnableFlag on guardrails (CASSANDRA-17544)
 +Merged from 4.1:
+  * Revert removal of withBufferSizeInMB(int size) in CQLSSTableWriter.Builder 
class and deprecate it in favor of withBufferSizeInMiB(int size) 
(CASSANDRA-17675)
   * Remove expired snapshots of dropped tables after restart (CASSANDRA-17619)
 -Merged from 4.0:
 - * Ensure FileStreamTask cannot compromise shared channel proxy for system 
table when interrupted (CASSANDRA-17663)
 - * silence benign SslClosedEngineException (CASSANDRA-17565)
 -Merged from 3.11:
 -Merged from 3.0:
 -
 -
 -4.1-alpha1
   * Handle config parameters upper bound on startup; Fix auto_snapshot_ttl and 
paxos_purge_grace_period min unit validations (CASSANDRA-17571)
   * Fix leak of non-standard Java types in our Exceptions as clients using JMX 
are unable to handle them.
     Remove useless validation that leads to unnecessary additional read of 
cassandra.yaml on startup (CASSANDRA-17638)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to