Merge branch 'master' into theodolite-kotlin

c85236b0 · Sören Henning · 1384573c · f6c3d87d · c85236b0 · c85236b0
Commit c85236b0 authored Mar 18, 2021 by Sören Henning
--- a/theodolite-benchmarks/uc4-workload-generator/Dockerfile
+++ b/theodolite-benchmarks/uc4-workload-generator/Dockerfile
--- a/theodolite-benchmarks/uc4-workload-generator/build.gradle
+++ b/theodolite-benchmarks/uc4-workload-generator/build.gradle
--- a/theodolite-benchmarks/uc4-workload-generator/src/main/java/theodolite/uc4/workloadgenerator/ConfigPublisher.java
+++ b/theodolite-benchmarks/uc4-workload-generator/src/main/java/theodolite/uc4/workloadgenerator/ConfigPublisher.java
--- a/theodolite-benchmarks/uc4-workload-generator/src/main/java/theodolite/uc4/workloadgenerator/LoadGenerator.java
+++ b/theodolite-benchmarks/uc4-workload-generator/src/main/java/theodolite/uc4/workloadgenerator/LoadGenerator.java
--- a/theodolite-benchmarks/uc4-workload-generator/src/main/java/theodolite/uc4/workloadgenerator/SensorRegistryBuilder.java
+++ b/theodolite-benchmarks/uc4-workload-generator/src/main/java/theodolite/uc4/workloadgenerator/SensorRegistryBuilder.java
--- a/theodolite-benchmarks/uc4-workload-generator/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc4-workload-generator/src/main/resources/META-INF/application.properties
--- a/theodolite-benchmarks/uc4-workload-generator/src/test/java/theodolite/uc4/workloadgenerator/SensorRegistryBuilderTest.java
+++ b/theodolite-benchmarks/uc4-workload-generator/src/test/java/theodolite/uc4/workloadgenerator/SensorRegistryBuilderTest.java
--- a/theodolite-benchmarks/workload-generator-commons/build.gradle
+++ b/theodolite-benchmarks/workload-generator-commons/build.gradle