Merge pull request #198 from mssonicbld/sonicbld/202305-merge

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305
Azure · Dec 22, 2023 · e508edb · e508edb
2 parents 04d5552 + 3b99dc6
commit e508edb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/dhcpmon b/src/dhcpmon
diff --git a/src/dhcprelay b/src/dhcprelay
diff --git a/src/sonic-host-services b/src/sonic-host-services
+1 −0		.azure-pipelines/build.yml
+1 −1		objects.mk
+163 −11		src/dhcp_device.cpp
+24 −0		src/dhcp_device.h
+2 −1		.github/workflows/codeql-analysis.yml
+19 −1		src/relay.cpp
+10 −0		src/relay.h
+11 −0		test/mock_relay.cpp
+1 −1		scripts/caclmgrd
+38 −0		tests/caclmgrd/caclmgrd_generate_allow_internal_docker_ip_traffic_test.py
+18 −0		tests/caclmgrd/test_internal_docker_ip_traffic_vectors.py