Skip to content

GitLab

Explore

Sign in
Register

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

16d18364

Commit 16d18364 authored 2 years ago by Stefano Di Frischia

Downloads
- Plain Diff

Merge branch 'L2SS-958-resolve-configdb-conflicts' into 'master'

L2SS-958: fix configdb conflicts

Closes L2SS-958

See merge request !435

parents 219c41d1 cc172a6d

No related branches found

No related tags found

1 merge request!435L2SS-958: fix configdb conflicts

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

CDB/LOFAR_ConfigDb.json 1 addition, 1 deletion

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

CDB/stations/simulators_ConfigDb.json
tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_temperature_manager.py 1 addition, 0 deletions

...n_test/default/devices/test_device_temperature_manager.py

with 2 additions and 7 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