ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-21 05:43:12 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	dev-requirements.txt
#	requirements.txt
#	setup.py
This commit is contained in:
grossmj 2024-08-03 12:58:19 +02:00
commit 24cace8122
No known key found for this signature in database
GPG Key ID: 0A2D76AC45EA25CD
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev-requirements.txt
View File

@ -1,7 +1,7 @@
pytest==8.1.1 pytest==8.3.2
flake8==7.0.0 flake8==7.1.0
pytest-timeout==2.3.1 pytest-timeout==2.3.1
pytest-asyncio==0.21.1 pytest-asyncio==0.23.8
requests==2.32.3 requests==2.32.3
httpx==0.24.1 # version 0.24.1 is required by httpx_ws httpx==0.24.1 # version 0.24.1 is required by httpx_ws
httpx_ws==0.4.2 httpx_ws==0.4.2

2
gns3server/configs/iou_l2_base_startup-config.txt
View File

@ -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 ! 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 cef
no ip domain-lookup no ip domain lookup
! !
! !
! !

2
gns3server/configs/iou_l3_base_startup-config.txt
View File

@ -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 ! 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 cef
no ip domain-lookup no ip domain lookup
! !
! !
ip tcp synwait-time 5 ip tcp synwait-time 5

2
requirements.txt
View File

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