IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
kijanowski 2023-05-17 11:29:04 +02:00
parent 2268dc9c06
commit 1101df95c4
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java
View File

@ -293,7 +293,6 @@ public class Cqld4Space implements AutoCloseable {
.add(Param.optional("whitelist", String.class, "list of whitelist hosts addresses")) .add(Param.optional("whitelist", String.class, "list of whitelist hosts addresses"))
.add(Param.optional("showstmt", Boolean.class, "show the contents of the statement in the log")) .add(Param.optional("showstmt", Boolean.class, "show the contents of the statement in the log"))
.add(Param.optional("cloud_proxy_address", String.class, "Cloud Proxy Address")) .add(Param.optional("cloud_proxy_address", String.class, "Cloud Proxy Address"))
.add(Param.optional("maxtries", Integer.class))
.add(SSLKsFactory.get().getConfigModel()) .add(SSLKsFactory.get().getConfigModel())
.add(getDriverOptionsModel()) .add(getDriverOptionsModel())
.add(new OptionHelpers(new OptionsMap()).getConfigModel()) .add(new OptionHelpers(new OptionsMap()).getConfigModel())