From 9e518412b305737162352f1f06245da77a534817 Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 4 Jun 2019 15:03:28 +0200 Subject: [PATCH 1/5] Set keyserver port to 80 in remote install script. Fixes #1596 --- scripts/remote-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remote-install.sh b/scripts/remote-install.sh index 00580d4a..39598dd8 100644 --- a/scripts/remote-install.sh +++ b/scripts/remote-install.sh @@ -146,7 +146,7 @@ deb-src http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME}-updates main univer EOFLIST2 fi -apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A2E3EF7B +apt-key adv --keyserver keyserver.ubuntu.com:80 --recv-keys A2E3EF7B log "Update system packages" apt-get update From 54d50b2ef49f5bb74b1b98a5a97c4fe5fb15a807 Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 4 Jun 2019 15:10:34 +0200 Subject: [PATCH 2/5] Set hkp protocol for keyserver in remote install script. Fixes #1596 --- scripts/remote-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remote-install.sh b/scripts/remote-install.sh index 39598dd8..6937141e 100644 --- a/scripts/remote-install.sh +++ b/scripts/remote-install.sh @@ -146,7 +146,7 @@ deb-src http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME}-updates main univer EOFLIST2 fi -apt-key adv --keyserver keyserver.ubuntu.com:80 --recv-keys A2E3EF7B +apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys A2E3EF7B log "Update system packages" apt-get update From 2476581dca9d6057286140dc313bd16a14076e3e Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 12 Jun 2019 14:35:13 +0200 Subject: [PATCH 3/5] Change uBridge debug level to '1' when debugging is enabled. Fixes #1598 --- gns3server/ubridge/hypervisor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gns3server/ubridge/hypervisor.py b/gns3server/ubridge/hypervisor.py index 91ed58c4..12a8aff5 100644 --- a/gns3server/ubridge/hypervisor.py +++ b/gns3server/ubridge/hypervisor.py @@ -256,5 +256,5 @@ class Hypervisor(UBridgeHypervisor): command = [self._path] command.extend(["-H", "{}:{}".format(self._host, self._port)]) if log.getEffectiveLevel() == logging.DEBUG: - command.extend(["-d", "2"]) + command.extend(["-d", "1"]) return command From cb1f73e9a2e48a3fae93c981af8be225e7928c84 Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 14 Jun 2019 10:47:07 +0200 Subject: [PATCH 4/5] Release v2.1.21 --- CHANGELOG | 4 ++++ gns3server/crash_report.py | 2 +- gns3server/version.py | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fc248245..5061f73a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ # Change Log +## 2.1.21 14/06/2019 + +* Change uBridge debug level to '1' when debugging is enabled. Fixes #1598 + ## 2.1.20 29/05/2019 * Ignore Unicode errors when reading base config file contents. diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py index ca042692..ef803116 100644 --- a/gns3server/crash_report.py +++ b/gns3server/crash_report.py @@ -57,7 +57,7 @@ class CrashReport: Report crash to a third party service """ - DSN = "https://7906a5d6a7d74311a065c18376ccbcd6:2ac5bbbc01a74192a8059a8f350d4efe@sentry.io/38482" + DSN = "https://d3a7fc2e40154fa1935e0def7d9b97d6:2cacd4ef1aea4077ace2d071c4b5f4d6@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 1e848f62..0d1516d4 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.1.21dev1" -__version_info__ = (2, 1, 21, 99) +__version__ = "2.1.21" +__version_info__ = (2, 1, 21, 0) # If it's a git checkout try to add the commit if "dev" in __version__: From 7c33d3510a7fa6314fde32373f33b705a8326160 Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 14 Jun 2019 19:42:18 +0200 Subject: [PATCH 5/5] Development on 2.1.22dev1 --- gns3server/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gns3server/version.py b/gns3server/version.py index 0d1516d4..4d850afd 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.1.21" -__version_info__ = (2, 1, 21, 0) +__version__ = "2.1.22dev1" +__version_info__ = (2, 1, 22, 99) # If it's a git checkout try to add the commit if "dev" in __version__: