You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by dc...@apache.org on 2020/11/10 18:50:36 UTC
[cassandra] branch cassandra-3.11 updated (ffd3d41 -> 8ffa79f)
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from ffd3d41 Merge branch 'cassandra-3.0' into cassandra-3.11
new 4d1d024 jvm dtest is strict on properties which causes upgrade tests to fail
new 22279a4 Merge branch 'cassandra-2.2' into cassandra-3.0
new 8ffa79f Merge branch 'cassandra-3.0' into cassandra-3.11
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:
.../cassandra/config/YamlConfigurationLoader.java | 10 +++++++--
.../apache/cassandra/distributed/Constants.java | 24 ++++++++--------------
.../cassandra/distributed/UpgradeableCluster.java | 1 +
.../distributed/impl/AbstractCluster.java | 3 ++-
.../cassandra/distributed/impl/Instance.java | 8 ++++++--
5 files changed, 25 insertions(+), 21 deletions(-)
copy src/java/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExecutorMBean.java => test/distributed/org/apache/cassandra/distributed/Constants.java (59%)
---------------------------------------------------------------------
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.0' into cassandra-3.11
Posted by dc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 8ffa79f37031119d2b01ec1523b9e32d58d59cf6
Merge: ffd3d41 22279a4
Author: David Capwell <dc...@apache.org>
AuthorDate: Tue Nov 10 10:47:28 2020 -0800
Merge branch 'cassandra-3.0' into cassandra-3.11
.../cassandra/config/YamlConfigurationLoader.java | 10 +++++--
.../apache/cassandra/distributed/Constants.java | 34 ++++++++++++++++++++++
.../cassandra/distributed/UpgradeableCluster.java | 1 +
.../distributed/impl/AbstractCluster.java | 3 +-
.../cassandra/distributed/impl/Instance.java | 8 +++--
5 files changed, 51 insertions(+), 5 deletions(-)
diff --cc src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
index ce4b4e2,d2563b8..1dedb29
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@@ -135,11 -128,16 +135,16 @@@ public class YamlConfigurationLoader im
}
}
- @SuppressWarnings("unchecked") //getSingleData returns Object, not T
public static <T> T fromMap(Map<String,Object> map, Class<T> klass)
{
+ return fromMap(map, true, klass);
+ }
+
+ @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());
- YamlConfigurationLoader.MissingPropertiesChecker propertiesChecker = new YamlConfigurationLoader.MissingPropertiesChecker();
+ YamlConfigurationLoader.PropertiesChecker propertiesChecker = new YamlConfigurationLoader.PropertiesChecker();
constructor.setPropertyUtils(propertiesChecker);
Yaml yaml = new Yaml(constructor);
Node node = yaml.represent(map);
diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index 50aea0b,ff0095d..8a7b5a2
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -63,9 -62,9 +63,10 @@@ import org.apache.cassandra.db.Memtable
import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.db.commitlog.CommitLog;
import org.apache.cassandra.db.compaction.CompactionManager;
+import org.apache.cassandra.db.monitoring.ApproximateTime;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.Token;
+ import org.apache.cassandra.distributed.Constants;
import org.apache.cassandra.distributed.api.ICluster;
import org.apache.cassandra.distributed.api.ICoordinator;
import org.apache.cassandra.distributed.api.IInstance;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org