This is an automated email from the ASF dual-hosted git repository. dcapwell pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 95848870403413e216135976a780596b8085b8d3 Merge: 53a67ff2c3 6396562f71 Author: David Capwell <[email protected]> AuthorDate: Tue May 10 12:41:37 2022 -0700 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 1 + .../cassandra/config/DatabaseDescriptor.java | 20 ++- .../apache/cassandra/locator/TokenMetadata.java | 2 +- .../apache/cassandra/service/StorageService.java | 17 ++- .../cassandra/distributed/impl/Instance.java | 17 ++- .../distributed/test/jmx/JMXGetterCheckTest.java | 143 +++++++++++++++++++++ test/unit/org/apache/cassandra/cql3/CQLTester.java | 2 +- 7 files changed, 187 insertions(+), 15 deletions(-) diff --cc CHANGES.txt index f3c79ce3da,5105707d4b..eae4db0236 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ -4.1 +4.2 + * 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: + * StorageService read threshold get methods throw NullPointerException due to not handling null configs (CASSANDRA-17593) +Merged from 4.0: +Merged from 3.11: +Merged from 3.0: + + +4.1 * Rename truncate_drop guardrail to drop_truncate_table (CASSANDRA-17592) * nodetool enablefullquerylog can NPE when directory has no files (CASSANDRA-17595) * Add auto_snapshot_ttl configuration (CASSANDRA-16790) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
