From 1101df95c4e3fb323819d3c005f26b753dba21e2 Mon Sep 17 00:00:00 2001 From: kijanowski Date: Wed, 17 May 2023 11:29:04 +0200 Subject: [PATCH] Resolve merge conflicts --- .../src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java | 1 - 1 file changed, 1 deletion(-) diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java index 89bd66961..eebb23c14 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java @@ -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())