grossmj 2ea0aa5ded Merge branch '2.1' into 2.2 ...

# Conflicts:
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py

2018-04-18 17:08:42 +08:00

..

appliances

Sync appliance files.

2018-04-18 16:12:30 +08:00

compute

Merge branch '2.1' into 2.2

2018-04-18 17:08:42 +08: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-04-18 17:08:42 +08:00

handlers

Merge branch '2.1' into 2.2

2018-04-18 17:08:42 +08:00

schemas

Merge branch '2.1' into 2.2

2018-04-18 17:08:42 +08:00

symbols

Custom icons and small fixes for TraceNG integration.

2018-03-14 16:56:37 +07:00

templates

Update documentation links

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

ubridge

Merge branch '2.1' into 2.2

2018-04-18 17:08:42 +08:00

utils

Returns the ports' adapter types and mac addresses when available.

2018-04-06 13:19:17 +07:00

web

Some spring cleaning.

2018-03-15 14:17:39 +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.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

Base support for TraceNG.

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

version.py

Bump version to 2.2.0dev2

2018-04-03 12:51:09 +07:00