Commit 3a0b1d0d authored by Daniel Seybold's avatar Daniel Seybold

fixed more merge commits

parent 01190f28
Pipeline #81007 passed with stage
in 15 minutes and 48 seconds
......@@ -45,17 +45,7 @@ public class WorkloadApiServiceImpl extends WorkloadApiService {
//TPC-C constants
private final String TPCC_RESULT_FOLDER = "TPCC/";
private static final String TPCC_BINARY = "./cockroach";
<<<<<<< HEAD
//TSBS constants
private final String TSBS_RESULT_FOLDER = "TSBS/";
private static final String TSBS_BINARY = "/opt/workloads/tsbs/bin/";
private static final String TSBS_SCRIPTS = "/opt/workloads/tsbs/src/omi-gitlab.e-technik.uni-ulm.de/mowgli/benchmarks/mowgli-tsbs/scripts/";
=======
>>>>>>> 1f37d36184567e516e0854bf1dd0cf0073592d05
@Override
public Response workloadResultGet(@NotNull String taskId, @NotNull String workloadType,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment