Merge branch 'master' into 'feature/app-wg-with-avro'
# Conflicts: # execution/uc1-workload-generator/deployment.yaml # execution/uc2-workload-generator/deployment.yaml # execution/uc3-workload-generator/deployment.yaml # execution/uc4-workload-generator/deployment.yaml
No related branches found
No related tags found
This commit is part of merge request !28. Comments created here will be created in the context of that merge request.
Showing
- .gitlab-ci.yml 21 additions, 2 deletions.gitlab-ci.yml
- execution/uc1-application/aggregation-deployment.yaml 1 addition, 1 deletionexecution/uc1-application/aggregation-deployment.yaml
- execution/uc1-workload-generator/deployment.yaml 1 addition, 1 deletionexecution/uc1-workload-generator/deployment.yaml
- execution/uc2-application/aggregation-deployment.yaml 1 addition, 1 deletionexecution/uc2-application/aggregation-deployment.yaml
- execution/uc2-workload-generator/deployment.yaml 1 addition, 1 deletionexecution/uc2-workload-generator/deployment.yaml
- execution/uc3-application/aggregation-deployment.yaml 1 addition, 1 deletionexecution/uc3-application/aggregation-deployment.yaml
- execution/uc3-workload-generator/deployment.yaml 1 addition, 1 deletionexecution/uc3-workload-generator/deployment.yaml
- execution/uc4-application/aggregation-deployment.yaml 1 addition, 1 deletionexecution/uc4-application/aggregation-deployment.yaml
- execution/uc4-workload-generator/deployment.yaml 1 addition, 1 deletionexecution/uc4-workload-generator/deployment.yaml
- uc2-application/src/main/java/theodolite/uc2/streamprocessing/JointRecordParents.java 22 additions, 0 deletions...a/theodolite/uc2/streamprocessing/JointRecordParents.java
- uc2-application/src/main/java/theodolite/uc2/streamprocessing/SensorParentKey.java 20 additions, 0 deletions...java/theodolite/uc2/streamprocessing/SensorParentKey.java
Loading
Please register or sign in to comment