1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-04 22:28:12 +00:00
gns3-server/gns3server/compute/docker/resources
grossmj 426c16e296 Merge branch '2.2' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	CHANGELOG
#	appveyor.yml
#	dev-requirements.txt
#	gns3server/controller/compute.py
#	gns3server/crash_report.py
#	gns3server/version.py
#	gns3server/web/route.py
#	pytest.ini
#	requirements.txt
#	tests/compute/dynamips/test_dynamips_router.py
#	tests/compute/test_base_node.py
#	tests/compute/vmware/test_vmware_manager.py
#	tests/compute/vmware/test_vmware_vm.py
#	tests/controller/gns3vm/test_virtualbox_gns3_vm.py
2022-08-30 11:53:12 +02:00
..
bin Remove busybox and copy system busybox in setup.py 2021-08-11 17:27:47 +09:30
etc/udhcpc Rename hypervisor to compute 2016-04-15 17:59:59 +02:00
init.sh Use original $PATH in init.sh for Docker containers. Ref #2069 2022-08-28 12:06:56 +02:00
run-cmd.sh Improvement of support for docker USER directive. Fixes #1727. 2020-03-19 17:50:27 +10:30