forked from M-Labs/artiq
devices.ctlmgr -> master.ctlmgr
This commit is contained in:
parent
2ada5227f0
commit
93f4f31f45
|
@ -11,7 +11,7 @@ from artiq.protocols.pc_rpc import Server
|
|||
from artiq.protocols.logging import LogForwarder, SourceFilter
|
||||
from artiq.tools import (simple_network_args, atexit_register_coroutine,
|
||||
bind_address_from_args, add_common_args)
|
||||
from artiq.devices.ctlmgr import ControllerManager
|
||||
from artiq.devices.master import ControllerManager
|
||||
|
||||
|
||||
def get_argparser():
|
||||
|
|
|
@ -4,7 +4,7 @@ import unittest
|
|||
import logging
|
||||
import asyncio
|
||||
|
||||
from artiq.devices.ctlmgr import Controllers
|
||||
from artiq.devices.master import Controllers
|
||||
from artiq.protocols.pc_rpc import AsyncioClient
|
||||
from artiq.tools import expect_no_log_messages
|
||||
|
||||
|
|
Loading…
Reference in New Issue