devices/clients/opcua_client.py · 6314a1020cde2a2dfefef4d2935641a892b853a0 · LOFAR2.0 / tango

3 years ago

Merge branch '-add-apscu-apsct' of... · 4f7e79db

Jan David Mol authored 3 years ago

Merge branch 'L2SS-358-add-apscu-apsct' of https://git.astron.nl/lofar2.0/tango into L2SS-358-add-apscu-apsct

Conflicts:
	CDB/recv-sim-config.json
	CDB/stations/LTS_ConfigDb.json
	CDB/unb2-sim-config.json
	devices/clients/opcua_client.py
	devices/devices/apsct.py
	devices/devices/apspu.py
	devices/devices/opcua_device.py
	devices/devices/recv.py
	devices/devices/unb2.py

4f7e79db

History

Merge branch '-add-apscu-apsct' of...

Jan David Mol authored 3 years ago

Merge branch 'L2SS-358-add-apscu-apsct' of https://git.astron.nl/lofar2.0/tango into L2SS-358-add-apscu-apsct

Conflicts:
	CDB/recv-sim-config.json
	CDB/stations/LTS_ConfigDb.json
	CDB/unb2-sim-config.json
	devices/clients/opcua_client.py
	devices/devices/apsct.py
	devices/devices/apspu.py
	devices/devices/opcua_device.py
	devices/devices/recv.py
	devices/devices/unb2.py

Code owners

Assign users and groups as approvers for specific file changes. Learn more.