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

e322ab9b

Commit e322ab9b authored 3 years ago by Jan David Mol

Downloads
- Plain Diff

Merge branch 'master' into 'L2SS-370-ordered-defaults'

# Conflicts:
#   devices/devices/recv.py
#   devices/devices/sdp/sdp.py

parents ef9c6339 c9aa3feb

No related branches found

No related tags found

1 merge request!115L2SS-370: Set some default properties first

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

devices/devices/docker_device.py 4 additions, 35 deletions

devices/devices/docker_device.py
devices/devices/hardware_device.py 14 additions, 12 deletions

devices/devices/hardware_device.py
devices/devices/opcua_device.py 115 additions, 0 deletions

devices/devices/opcua_device.py
devices/devices/recv.py 3 additions, 72 deletions

devices/devices/recv.py
devices/devices/sdp/sdp.py 2 additions, 77 deletions

devices/devices/sdp/sdp.py
devices/devices/sdp/statistics.py 9 additions, 40 deletions

devices/devices/sdp/statistics.py
devices/devices/unb2.py 2 additions, 70 deletions

devices/devices/unb2.py

with 149 additions and 306 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