grossmj 33e8710495 Merge branch '2.1' into 2.2 ...

# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/controller/compute.py
#	gns3server/controller/gns3vm/__init__.py
#	gns3server/controller/link.py
#	gns3server/controller/project.py
#	gns3server/handlers/api/controller/project_handler.py
#	gns3server/handlers/api/controller/server_handler.py
#	gns3server/utils/asyncio/__init__.py
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	tests/compute/qemu/test_qemu_vm.py

2018-08-29 15:57:54 +07:00

..

appliances

Update appliance templates.

2018-08-18 16:49:21 +07:00

compute

Merge branch '2.1' into 2.2

2018-08-29 15:57:54 +07:00

configs

New VPCS base config. Fixes #786.

2017-06-28 17:40:54 +08:00

controller

Merge branch '2.1' into 2.2

2018-08-29 15:57:54 +07:00

handlers

Merge branch '2.1' into 2.2

2018-08-29 15:57:54 +07:00

schemas

Merge branch '2.1' into 2.2

2018-08-29 15:57:54 +07:00

static

Gitkeep for web-ui directory

2018-06-26 12:26:04 +02:00

symbols

Add affinity symbols. Ref https://github.com/GNS3/gns3-gui/issues/2488

2018-08-12 22:08:48 +07:00

templates

Serve WebUI handlers and update-bundled-web-ui script, Ref: #1362

2018-06-26 12:09:08 +02:00

ubridge

Merge branch '2.1' into 2.2

2018-08-29 15:57:54 +07:00

utils

Merge branch '2.1' into 2.2

2018-08-29 15:57:54 +07:00

web

Merge branch '2.1' into 2.2

2018-08-29 15:57:54 +07:00

__init__.py

New base server.

2015-01-13 17:05:26 -07:00

__main__.py

Allow to start server with python -m gns3server

2015-08-25 22:31:45 +02:00

config.py

Do not show log message if configuration file doesn't exist. Fixes #1206.

2018-01-08 18:07:15 +07:00

crash_report.py

Release v2.1.9

2018-08-13 13:13:46 +02:00

main.py

History support for console and telnet application, Fixes: #1083

2017-07-25 16:18:07 +02:00

notification_queue.py

Merge 2.1 into 2.2 branch

2018-03-12 13:38:50 +07:00

run.py

Base support for TraceNG.

2018-03-12 17:57:13 +07:00

version.py

Forbid controller and compute servers to be different versions.

2018-08-22 16:54:43 +07:00