You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2023/01/24 12:39:14 UTC
[cassandra] branch cassandra-4.0 updated (8bb9c72f58 -> 5f54d64c78)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 8bb9c72f58 Add safeguard so cleanup fails when node has pending ranges
new e7f55ab8c3 switch to SafeConstructor
new 92245b0f07 Merge branch 'cassandra-3.0' into cassandra-3.11
new 5f54d64c78 Merge branch 'cassandra-3.11' into cassandra-4.0
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/YamlConfigurationLoader.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5f54d64c78818125f47ecc509a757f4b55fcc893
Merge: 8bb9c72f58 92245b0f07
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue Jan 24 06:31:50 2023 -0600
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/YamlConfigurationLoader.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --cc CHANGES.txt
index 789d8f7fa8,fd15a7f770..0c0b1801c6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,7 +1,19 @@@
-3.11.15
+4.0.8
+ * Add safeguard so cleanup fails when node has pending ranges (CASSANDRA-16418)
+ * Fix legacy clustering serialization for paging with compact storage (CASSANDRA-17507)
+ * Add support for python 3.11 (CASSANDRA-18088)
+ * Fix formatting of duration in cqlsh (CASSANDRA-18141)
+ * Fix sstable loading of keyspaces named snapshots or backups (CASSANDRA-14013)
+ * Avoid ConcurrentModificationException in STCS/DTCS/TWCS.getSSTables (CASSANDRA-17977)
+ * Restore internode custom tracing on 4.0's new messaging system (CASSANDRA-17981)
+ * Harden parsing of boolean values in CQL in PropertyDefinitions (CASSANDRA-17878)
+ * Fix error message about type hints (CASSANDRA-17915)
+ * Fix possible race condition on repair snapshots (CASSANDRA-17955)
+ * Fix ASM bytecode version inconsistency (CASSANDRA-17873)
+Merged from 3.11:
* Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013)
Merged from 3.0:
+ * Switch to snakeyaml's SafeConstructor (CASSANDRA-18150)
* Expand build.dir property in rat targets (CASSANDRA-18183)
* Suppress CVE-2022-41881 (CASSANDRA-18148)
* Default role is created with zero timestamp (CASSANDRA-12525)
diff --cc src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
index a8d4695cb0,e55ec85109..48af78bb1f
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@@ -126,9 -122,8 +126,9 @@@ public class YamlConfigurationLoader im
}
- Constructor constructor = new CustomConstructor(Config.class, Yaml.class.getClassLoader());
+ SafeConstructor constructor = new CustomConstructor(Config.class, Yaml.class.getClassLoader());
- PropertiesChecker propertiesChecker = new PropertiesChecker();
+ Map<Class<?>, Map<String, Replacement>> replacements = getNameReplacements(Config.class);
+ PropertiesChecker propertiesChecker = new PropertiesChecker(replacements);
constructor.setPropertyUtils(propertiesChecker);
Yaml yaml = new Yaml(constructor);
Config result = loadConfig(yaml, configBytes);
@@@ -151,9 -145,8 +151,9 @@@
@SuppressWarnings("unchecked") //getSingleData returns Object, not T
public static <T> T fromMap(Map<String,Object> map, boolean shouldCheck, Class<T> klass)
{
- Constructor constructor = new YamlConfigurationLoader.CustomConstructor(klass, klass.getClassLoader());
+ SafeConstructor constructor = new YamlConfigurationLoader.CustomConstructor(klass, klass.getClassLoader());
- YamlConfigurationLoader.PropertiesChecker propertiesChecker = new YamlConfigurationLoader.PropertiesChecker();
+ Map<Class<?>, Map<String, Replacement>> replacements = getNameReplacements(Config.class);
+ YamlConfigurationLoader.PropertiesChecker propertiesChecker = new YamlConfigurationLoader.PropertiesChecker(replacements);
constructor.setPropertyUtils(propertiesChecker);
Yaml yaml = new Yaml(constructor);
Node node = yaml.represent(map);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org