grossmj afdda427d2 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

2021-08-29 19:23:51 +09:30

..

__init__.py

Base for generic switch nodes. Ref #492.

2016-05-15 11:23:14 -06:00

cloud.py

Merge branch '2.2' into 3.0

2021-06-12 14:36:32 +09:30

ethernet_hub.py

Rename __json__() to asdict()

2021-04-17 23:34:28 +09:30

ethernet_switch.py

Rename __json__() to asdict()

2021-04-17 23:34:28 +09:30

nat.py

Merge branch 'master' into 3.0

2021-08-29 19:23:51 +09:30