grossmj 28f8216590 Merge branch '2.1' into 2.2 ...

# Conflicts:
#	gns3server/version.py
#	requirements.txt

2018-01-23 12:47:13 +07:00

..

appliances

Update appliance files.

2018-01-18 11:57:48 +08:00

compute

Fix same base MAC for duplicated IOS routers. Fixes #1264.

2018-01-17 14:01:44 +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-01-23 12:47:13 +07:00

handlers

Fix more client/server version tests.

2018-01-18 16:14:09 +08: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

Use Npcap DLL on Windows when checking for uBridge version.

2017-09-01 16:22:43 +07:00

utils

Remotely close telnet console. Ref #2330

2017-11-20 15:28:07 +01:00

web

Merge pull request #1205 from GNS3/aiohttp-2.3.1

2017-12-18 11:09:16 +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.3

2018-01-19 07:15:39 +01:00

main.py

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

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

notification_queue.py

Refresh CPU/RAM info every 1 second. Ref #2262.

2018-01-15 14:42:01 +07:00

run.py

Handle when pid file is corrupt

2017-07-20 16:17:07 +02:00

version.py

Bump to version 2.2.0dev1 & refresh resources/ui files.

2018-01-23 11:36:57 +07:00