Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

tango
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira issues
- Open Jira
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

30cae5fa

Commit 30cae5fa authored 3 years ago by Jan David Mol

Downloads
- Plain Diff

Merge branch 'master' into L2SS-287-python-packaging

parents a8db638d 7bd3b86f

No related branches found

No related tags found

1 merge request!146L2SS-287: implement python packaging

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

CDB/stations/simulators_ConfigDb.json 0 additions, 0 deletions

CDB/stations/simulators_ConfigDb.json
docker-compose/Makefile 8 additions, 2 deletions

docker-compose/Makefile
docker-compose/archiver.yml 4 additions, 4 deletions

docker-compose/archiver.yml
docker-compose/grafana.yml 1 addition, 1 deletion

docker-compose/grafana.yml
docker-compose/prometheus.yml 1 addition, 1 deletion

docker-compose/prometheus.yml
docker-compose/rest.yml 1 addition, 1 deletion

docker-compose/rest.yml
docker-compose/tango.yml 2 additions, 2 deletions

docker-compose/tango.yml
sbin/run_integration_test.sh 5 additions, 1 deletion

sbin/run_integration_test.sh

with 22 additions and 12 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