grossmj 88674455a3 Merge branch '2.1' into 2.2 ...

# Conflicts:
#	gns3server/version.py
#	tests/compute/docker/test_docker_vm.py

2018-03-14 18:40:37 +07:00

..

appliances

Merge 2.1 into 2.2 branch

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

compute

Merge 2.1 into 2.2 branch

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

configs

New VPCS base config. Fixes #786.

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

controller

Merge 2.1 into 2.2 branch

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

handlers

Merge 2.1 into 2.2 branch

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

schemas

Fix typo in vcpus on VirtualBoxVM, fixes: #1213

2017-11-07 11:15:49 +01:00

symbols

Fix symbols permissions

2017-07-19 13:57:19 +02:00

templates

Update documentation links

2017-04-03 16:27:08 +02:00

ubridge

Merge 2.1 into 2.2 branch

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

utils

Merge 2.1 into 2.2 branch

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

web

Conservative approach to supported versions of Python 3.4 and asyncio.ensure_future, Ref. #1269

2018-01-29 12:13:20 +01: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.4

2018-03-12 09:19:18 +01: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

Merge 2.1 into 2.2 branch

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

version.py

Back to development on v2.1.5dev1

2018-03-12 11:27:02 +01:00