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

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

commit c7e7984008062aa2cf2de5a1fc080674bb2139ff
Merge: 044294fe0f a604c0d4de
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Sun May 29 09:59:43 2022 +0200

    Merge branch 'cassandra-4.1' into trunk

 CHANGES.txt                                        |   1 +
 .../cassandra/service/snapshot/SnapshotLoader.java |  31 ++-
 .../service/snapshot/SnapshotManager.java          |  36 ++--
 .../cassandra/service/snapshot/TableSnapshot.java  |   2 +-
 .../distributed/test/AutoSnapshotTtlTest.java      |  36 ++++
 .../cassandra/distributed/test/SnapshotsTest.java  | 229 ++++++++++++++-------
 .../validation/operations/AutoSnapshotTest.java    |  39 +++-
 .../service/snapshot/SnapshotManagerTest.java      |  11 +-
 8 files changed, 281 insertions(+), 104 deletions(-)

diff --cc CHANGES.txt
index a7c8c576d6,07ccdf23a8..fb75bc510d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,12 +1,13 @@@
 -4.1-alpha2
 - * Remove expired snapshots of dropped tables after restart (CASSANDRA-17619) 
 -Merged from 4.0:
 - * silence benign SslClosedEngineException (CASSANDRA-17565)
 -Merged from 3.11:
 -Merged from 3.0:
 -
 -
 -4.1-alpha1
 +4.2
 + * 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:
++ * Remove expired snapshots of dropped tables after restart (CASSANDRA-17619)
   * 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: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to