srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

devices.ctlmgr -> master.ctlmgr

This commit is contained in:
Sebastien Bourdeauducq 2019-04-20 00:25:44 +08:00
parent 2ada5227f0
commit 93f4f31f45
4 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
artiq/devices/__init__.py
View File

2
artiq/frontend/artiq_ctlmgr.py
View File

@ -11,7 +11,7 @@ from artiq.protocols.pc_rpc import Server
from artiq.protocols.logging import LogForwarder, SourceFilter from artiq.protocols.logging import LogForwarder, SourceFilter
from artiq.tools import (simple_network_args, atexit_register_coroutine, from artiq.tools import (simple_network_args, atexit_register_coroutine,
bind_address_from_args, add_common_args) bind_address_from_args, add_common_args)
from artiq.devices.ctlmgr import ControllerManager from artiq.devices.master import ControllerManager
def get_argparser(): def get_argparser():

0
artiq/devices/ctlmgr.py → artiq/master/ctlmgr.py
View File

2
artiq/test/test_ctlmgr.py
View File

@ -4,7 +4,7 @@ import unittest
import logging import logging
import asyncio import asyncio
from artiq.devices.ctlmgr import Controllers from artiq.devices.master import Controllers
from artiq.protocols.pc_rpc import AsyncioClient from artiq.protocols.pc_rpc import AsyncioClient
from artiq.tools import expect_no_log_messages from artiq.tools import expect_no_log_messages