This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.11 by this push:
new e318841 ninja fix failure in DatabaseDescriptorRefTest
e318841 is described below
commit e3188417568e94b3a2fd8ddf834d0eb77245522f
Author: Andrés de la Peña <a.penya.gar...@gmail.com>
AuthorDate: Thu Jul 30 22:16:42 2020 +0100
ninja fix failure in DatabaseDescriptorRefTest
Caused by merge error in CASSANDRA-15907
---
test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java
b/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java
index ce59c01..88c965b 100644
--- a/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java
+++ b/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java
@@ -77,6 +77,7 @@ public class DatabaseDescriptorRefTest
"org.apache.cassandra.config.EncryptionOptions$ClientEncryptionOptions",
"org.apache.cassandra.config.EncryptionOptions$ServerEncryptionOptions",
"org.apache.cassandra.config.EncryptionOptions$ServerEncryptionOptions$InternodeEncryption",
+ "org.apache.cassandra.config.ReplicaFilteringProtectionOptions",
"org.apache.cassandra.config.YamlConfigurationLoader",
"org.apache.cassandra.config.YamlConfigurationLoader$PropertiesChecker",
"org.apache.cassandra.config.YamlConfigurationLoader$PropertiesChecker$1",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
