Merge remote-tracking branch 'origin/2.2' into 3.0

# Conflicts: # dev-requirements.txt # requirements.txt # setup.py
GNS3 · Aug 3, 2024 · 24cace8 · 24cace8
2 parents 9a3bd2e + 6746ef3
commit 24cace8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,7 +1,7 @@
-pytest==8.1.1
-flake8==7.0.0
+pytest==8.3.2
+flake8==7.1.0
 pytest-timeout==2.3.1
-pytest-asyncio==0.21.1
+pytest-asyncio==0.23.8
 requests==2.32.3
 httpx==0.24.1 # version 0.24.1 is required by httpx_ws
 httpx_ws==0.4.2
diff --git a/gns3server/configs/iou_l2_base_startup-config.txt b/gns3server/configs/iou_l2_base_startup-config.txt
@@ -15,7 +15,7 @@ no ip icmp rate-limit unreachable
 !
 ! due to some bugs with IOU, try to change the following line to 'ip cef' if your routing does not work
 no ip cef
-no ip domain-lookup
+no ip domain lookup
 !
 !
 !

diff --git a/gns3server/configs/iou_l3_base_startup-config.txt b/gns3server/configs/iou_l3_base_startup-config.txt
@@ -14,7 +14,7 @@ no ip icmp rate-limit unreachable
 !
 ! due to some bugs with IOU, try to change the following line to 'ip cef' if your routing does not work
 no ip cef
-no ip domain-lookup
+no ip domain lookup
 !
 !
 ip tcp synwait-time 5

diff --git a/requirements.txt b/requirements.txt
@@ -6,7 +6,7 @@ aiohttp>=3.9.5,<3.10
 async-timeout==4.0.3
 aiofiles>=24.1.0,<25.0
 Jinja2>=3.1.4,<3.2
-sentry-sdk==2.7.1,<2.8
+sentry-sdk==2.12,<2.13
 psutil==6.0.0
 distro>=1.9.0
 py-cpuinfo==9.0.0