Merge branch 'master' into 3.0

# Conflicts:
#	.github/workflows/testing.yml
#	gns3server/compute/builtin/nodes/nat.py
#	gns3server/compute/qemu/__init__.py
#	gns3server/controller/link.py
#	gns3server/utils/asyncio/embed_shell.py
#	gns3server/utils/asyncio/raw_command_server.py
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
This commit is contained in:
grossmj
2021-08-29 19:23:51 +09:30
27 changed files with 409 additions and 34 deletions

View File

@ -357,7 +357,7 @@ if __name__ == "__main__":
# Demo using telnet
shell = Demo(welcome_message="Welcome!\n")
server = create_telnet_shell(shell, loop=loop)
coro = asyncio.start_server(server.run, "127.0.0.1", 4444, loop=loop)
coro = asyncio.start_server(server.run, "127.0.0.1", 4444)
s = loop.run_until_complete(coro)
try:
loop.run_forever()