mirror of
https://github.com/nosqlbench/nosqlbench.git
synced 2025-02-25 18:55:28 -06:00
Resolve merge conflicts
This commit is contained in:
parent
2268dc9c06
commit
1101df95c4
@ -293,7 +293,6 @@ public class Cqld4Space implements AutoCloseable {
|
||||
.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("cloud_proxy_address", String.class, "Cloud Proxy Address"))
|
||||
.add(Param.optional("maxtries", Integer.class))
|
||||
.add(SSLKsFactory.get().getConfigModel())
|
||||
.add(getDriverOptionsModel())
|
||||
.add(new OptionHelpers(new OptionsMap()).getConfigModel())
|
||||
|
Loading…
Reference in New Issue
Block a user