From 7543d7587cbc7a9eacca96879de3acd91230aea0 Mon Sep 17 00:00:00 2001 From: grossmj Date: Mon, 15 Apr 2019 17:05:20 +0700 Subject: [PATCH] Release v2.2.0a5 --- CHANGELOG | 10 ++++++++++ gns3server/compute/qemu/qemu_vm.py | 2 +- gns3server/crash_report.py | 2 +- gns3server/version.py | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ac93f99e..bef31a41 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,15 @@ # Change Log +## 2.2.0a5 15/04/2019 + +* Back to the major.minor version for config files. Ref https://github.com/GNS3/gns3-gui/issues/2756 +* Fix templates missing after server restart. Fixes https://github.com/GNS3/gns3-gui/issues/2769 +* Fix bug when GNS3 VM were not saved. Fix tests. +* Some adjustments with compute WebSocket handling. Ref https://github.com/GNS3/gns3-server/issues/1564 +* Fix broken embedded console for Ethernet switch. Fixes #1574 +* Prevent locked nodes to be deleted. Fixes https://github.com/GNS3/gns3-gui/issues/2764 +* Remove old unused argument option. Fixes #1569 + ## 2.1.16 15/04/2019 * Fix broken embedded console for Ethernet switch. Fixes #1574 diff --git a/gns3server/compute/qemu/qemu_vm.py b/gns3server/compute/qemu/qemu_vm.py index 5d34da9b..b1c76009 100644 --- a/gns3server/compute/qemu/qemu_vm.py +++ b/gns3server/compute/qemu/qemu_vm.py @@ -746,7 +746,7 @@ class QemuVM(BaseNode): log.info('QEMU VM "{name}" [{id}] has set the QEMU initrd path to {initrd}'.format(name=self._name, id=self._id, initrd=initrd)) - if "asa" in initrd: + if "asa" in initrd and self._initrd != initrd: self.project.emit("log.warning", {"message": "Warning ASA 8 is not supported by GNS3 and Cisco, please use ASAv instead. Depending of your hardware and OS this could not work or you could be limited to one instance. If ASA 8 is not booting their is no GNS3 solution, you must to upgrade to ASAv."}) self._initrd = initrd diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py index c063d389..b88ddba5 100644 --- a/gns3server/crash_report.py +++ b/gns3server/crash_report.py @@ -58,7 +58,7 @@ class CrashReport: Report crash to a third party service """ - DSN = "https://eb305634570047afb80a73d634baa5f2:453d676bad2b4d068326e6cb22af7ae5@sentry.io/38482" + DSN = "https://7beef06951ab456bb9e17c0ffad7f494:2277ec5146db4649abde8c25c233e8b3@sentry.io/38482" if hasattr(sys, "frozen"): cacert = get_resource("cacert.pem") if cacert is not None and os.path.isfile(cacert): diff --git a/gns3server/version.py b/gns3server/version.py index 786e9d19..06b5a384 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,8 +23,8 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "2.2.0dev10" -__version_info__ = (2, 2, 0, 99) +__version__ = "2.2.0a5" +__version_info__ = (2, 2, 0, -99) # If it's a git checkout try to add the commit if "dev" in __version__: