resolve merge-conflict (a8fe5a8a) · Commits · Sören Henning / theodolite · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

theodolite
- Activity
- Members
- Labels
- Releases
- Model registry
- Contributor analytics
- Model experiments

Snippets Groups Projects

a8fe5a8a

Commit a8fe5a8a authored 3 years ago by Lorenz Boguhn

Downloads
- Plain Diff

resolve merge-conflict

parents bc6108a0 fc153c62

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

execution/README.md 12 additions, 19 deletions

execution/README.md
execution/theodolite.yaml 50 additions, 37 deletions

execution/theodolite.yaml
theodolite-quarkus/src/main/docker/Dockerfile.native 6 additions, 6 deletions

theodolite-quarkus/src/main/docker/Dockerfile.native
theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmarkDeployment.kt 9 additions, 5 deletions

...lin/theodolite/benchmark/KubernetesBenchmarkDeployment.kt
theodolite-quarkus/src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt 6 additions, 1 deletion

...src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt
theodolite-quarkus/src/main/kotlin/theodolite/evaluation/CsvExporter.kt 2 additions, 2 deletions

...rkus/src/main/kotlin/theodolite/evaluation/CsvExporter.kt
theodolite-quarkus/src/main/kotlin/theodolite/execution/Shutdown.kt 8 additions, 1 deletion

...-quarkus/src/main/kotlin/theodolite/execution/Shutdown.kt
theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt 33 additions, 3 deletions

...rc/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
theodolite-quarkus/src/main/kotlin/theodolite/k8s/TopicManager.kt 10 additions, 10 deletions

...te-quarkus/src/main/kotlin/theodolite/k8s/TopicManager.kt

with 136 additions and 84 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment