Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tango
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
tango
Merge requests
!18
Resolve #2021 "04 16 branched from master state bug fix"
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Merged
Resolve #2021 "04 16 branched from master state bug fix"
2021-04-16-Branched_from_master-state_bug_fix
into
master
Overview
49
Commits
17
Pipelines
0
Changes
13
Merged
Taya Snijder
requested to merge
2021-04-16-Branched_from_master-state_bug_fix
into
master
4 years ago
Overview
49
Commits
17
Pipelines
0
Changes
13
Expand
Closes #2021
0
0
Merge request reports
Compare
master
version 6
f75802f6
4 years ago
version 5
8439d8d8
4 years ago
version 4
7e2341d5
4 years ago
version 3
60388948
4 years ago
version 2
a232648b
4 years ago
version 1
2e8a8089
4 years ago
master (base)
and
latest version
latest version
1f0cc10e
17 commits,
4 years ago
version 6
f75802f6
16 commits,
4 years ago
version 5
8439d8d8
15 commits,
4 years ago
version 4
7e2341d5
14 commits,
4 years ago
version 3
60388948
12 commits,
4 years ago
version 2
a232648b
11 commits,
4 years ago
version 1
2e8a8089
6 commits,
4 years ago
13 files
+
591
−
355
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
13
Search (e.g. *.vue) (Ctrl+P)
CDB/test_ConfigDb.json
+
23
−
4
Options
@@ -19,17 +19,36 @@
"LTS/SDP/1"
:
{
"properties"
:
{
"OPC_Server_Name"
:
[
"
DESPi2
.astron.nl"
"
dop36
.astron.nl"
]
}
}
}
}
},
"
example_device
"
:
{
"
APSCTL
"
:
{
"1"
:
{
"example_device"
:
{
"LTS/example_device/1"
:
{
"APSCTL"
:
{
"LTS/APSCTL/1"
:
{
"properties"
:
{
"OPC_Server_Name"
:
[
"ltspi.astron.nl"
],
"OPC_Server_Port"
:
[
"4844"
],
"OPC_Time_Out"
:
[
"5.0"
]
}
}
}
}
},
"test_device"
:
{
"1"
:
{
"test_device"
:
{
"LTS/test_device/1"
:
{
"attribute_properties"
:
{
"Ant_mask_RW"
:
{
"archive_period"
:
[
Loading