Skip to content

Commit

Permalink
Merge pull request #153 from mssonicbld/sonicbld/202205-merge
Browse files Browse the repository at this point in the history 
[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205
  • Loading branch information
@mssonicbld
mssonicbld authored Nov 8, 2023
2 parents b9addcf + 22becf1 commit e7d6ab2
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 33 deletions.
4 changes: 2 additions & 2 deletions files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ libteam-utils==1.30-1
libteam5==1.30-1
libteamdctl0==1.30-1
libthrift-0.11.0==0.11.0-4
libthrift-dev==0.11.0-4
libthrift-dev==0.14.1
libthrift0==0.14.1
libyang==1.0.73
libyang-cpp==1.0.73
Expand All @@ -33,4 +33,4 @@ python3-thrift==0.14.1
python3-yang==1.0.73
sonic-mgmt-common==1.0.0
sonic-mgmt-common-codegen==1.0.0
thrift-compiler==0.11.0-4
thrift-compiler==0.14.1
24 changes: 12 additions & 12 deletions files/build/versions/default/versions-docker
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
amd64:amd64/debian:bullseye==sha256:3da0c9fb1282040a13e26074dc1712f656fc2fa6d8d2e264612e5c7266f17653
amd64:amd64/debian:buster==sha256:88a98482ebe4b8ef20104c844d74ac59a7241e8782c9ea3a1c1d47503dbbbddb
amd64:debian:bullseye==sha256:c141beaa9e0767774221cc82efe3a6712a1cc4f75d2699334dfd9a28a6f7357b
amd64:debian:buster==sha256:853b9ec779e55f670cbdcb5e15bfb778b5be2c5c61fc8c655638b7a977d273c6
arm64:arm64v8/debian:bullseye==sha256:7a89d1fd045f797f2f34dd778bdf19335587357c3603859f2048f4c0285b06a8
arm64:arm64v8/debian:buster==sha256:22d2604df80a9385e2dd191b518bb33b7204805e01fbc80621aac7441f8dd0fd
arm64:debian:bullseye==sha256:c141beaa9e0767774221cc82efe3a6712a1cc4f75d2699334dfd9a28a6f7357b
arm64:debian:buster==sha256:853b9ec779e55f670cbdcb5e15bfb778b5be2c5c61fc8c655638b7a977d273c6
armhf:arm32v7/debian:bullseye==sha256:6879eee9d653dfa6d92b36fa682482facf009a5434036afdba78b488ea1b7e62
armhf:arm32v7/debian:buster==sha256:68111b72aab43dcb684b0b4a3dc0926fcbb43f6f6c1f3a370ea6619ec7228d08
armhf:debian:bullseye==sha256:c141beaa9e0767774221cc82efe3a6712a1cc4f75d2699334dfd9a28a6f7357b
armhf:debian:buster==sha256:853b9ec779e55f670cbdcb5e15bfb778b5be2c5c61fc8c655638b7a977d273c6
amd64:amd64/debian:bullseye==sha256:758e59e5972964572033a2c0bd5a62e8f3fd01fa35114ba3ef8a60eb8707092e
amd64:amd64/debian:buster==sha256:6d307788805b89ceb86f31fbe1c5c7df4db77ae23514646598f47e545b8ffa67
amd64:debian:bullseye==sha256:a4aa0519fbd45786048bbc4daa7092fec803d22463f1cb6c4e7762dcb6a10cf0
amd64:debian:buster==sha256:53cf4f4dbe6f827072bde99045671754cca8174d0464d829c194a26e7ba2c134
arm64:arm64v8/debian:bullseye==sha256:d5ed76c5265576982e6599b6f12392290d9b52b315b19b28b640aaba6e8af002
arm64:arm64v8/debian:buster==sha256:f6b77bfe0dfdca8959f007d77822ae6f112673c29a22d31a8bfd48124040a0c3
arm64:debian:bullseye==sha256:a4aa0519fbd45786048bbc4daa7092fec803d22463f1cb6c4e7762dcb6a10cf0
arm64:debian:buster==sha256:53cf4f4dbe6f827072bde99045671754cca8174d0464d829c194a26e7ba2c134
armhf:arm32v7/debian:bullseye==sha256:bede2623dae269454c5b6dd4af15a10810a5f4ef75963d4eb6531628f98bd633
armhf:arm32v7/debian:buster==sha256:135b694cdbd5659a867c5ab7129518373ce38b37bc999380be2974cca958e014
armhf:debian:bullseye==sha256:a4aa0519fbd45786048bbc4daa7092fec803d22463f1cb6c4e7762dcb6a10cf0
armhf:debian:buster==sha256:53cf4f4dbe6f827072bde99045671754cca8174d0464d829c194a26e7ba2c134
10 changes: 5 additions & 5 deletions files/build/versions/default/versions-git
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
https://chromium.googlesource.com/chromium/tools/depot_tools.git==9f3b33a275e7a5b19d8ce4aba7960d2a38858681
https://chromium.googlesource.com/chromium/tools/depot_tools.git==ccc34d2b44d8520f9b4c2697001f36444c78cd66
https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
https://github.com/CESNET/libyang.git==7e5ea21030fe6632b6faad30c0de8d9669503773
https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6
https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
https://github.com/flashrom/flashrom.git==1dd7c88f41e49a076a189154928030d37ca00d26
https://github.com/FreeRADIUS/freeradius-server.git==f687a780b002f407e24a74427781f916a861307f
https://github.com/flashrom/flashrom.git==52b794ff26fedd81761630a6d4a0be824a33bc39
https://github.com/FreeRADIUS/freeradius-server.git==73604e0e1f7039a9a91d317ccad54f8f2b96bf93
https://github.com/FreeRADIUS/pam_radius.git==7d75a319e43d5e234b93f89cd461a11861d07b95
https://github.com/jeroennijhof/pam_tacplus.git==b89dba44b58ec7fdc9b5365b982aa4a316484a3c
https://github.com/jpirko/libteam.git==8b843e93cee1dab61fb79b01791201cdad45e1d1
https://github.com/lguohan/gnxi.git==3adf8b97755b49947e465b5a14645f11e79fa0cd
https://github.com/Marvell-switching/mrvl-prestera.git==8f9bcdaf58406c71a9038aea834fc8255de59848
https://github.com/Marvell-switching/mrvl-prestera.git==a955efe6deb4e66b44b413e415b000e4db5c278d
https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
https://github.com/opencomputeproject/SAI.git==16e505062ed1f2181e0144c891d617cddfb44f20
https://github.com/opencomputeproject/SAI.git==b4331a048ec7f80cdf20304b80894fb011dc7b6e
https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
https://github.com/sflow/host-sflow==6296a172c2c3879126298dc66994d38e68956185
https://github.com/sflow/sflowtool==2b622f99d36254884507d9137e6e99020db260cb
Expand Down
22 changes: 11 additions & 11 deletions files/build/versions/default/versions-mirror
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z
deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
debian==20231031T000225Z
debian-security==20231031T000224Z
download.docker.com_linux_debian_dists_bullseye==2023-10-26T15:36:36Z
debian==20231107T000230Z
debian-security==20231107T000220Z
download.docker.com_linux_debian_dists_bullseye==2023-11-06T13:37:32Z
download.docker.com_linux_debian_dists_buster==2023-10-26T15:36:37Z
packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
packages.trafficmanager.net_snapshot_debian-security_20231031T000224Z_dists_bullseye-security==2023-10-30T21:33:05Z
packages.trafficmanager.net_snapshot_debian-security_20231031T000224Z_dists_buster_updates==2023-10-30T21:33:04Z
packages.trafficmanager.net_snapshot_debian_20231031T000225Z_dists_bullseye==2023-10-07T11:07:16Z
packages.trafficmanager.net_snapshot_debian_20231031T000225Z_dists_bullseye-backports==2023-10-30T20:22:40Z
packages.trafficmanager.net_snapshot_debian_20231031T000225Z_dists_bullseye-updates==2023-10-30T20:22:40Z
packages.trafficmanager.net_snapshot_debian_20231031T000225Z_dists_buster==2023-06-10T08:53:33Z
packages.trafficmanager.net_snapshot_debian_20231031T000225Z_dists_buster-backports==2023-10-30T20:22:40Z
packages.trafficmanager.net_snapshot_debian_20231031T000225Z_dists_buster-updates==2023-06-10T08:55:10Z
packages.trafficmanager.net_snapshot_debian-security_20231107T000220Z_dists_bullseye-security==2023-11-06T23:02:37Z
packages.trafficmanager.net_snapshot_debian-security_20231107T000220Z_dists_buster_updates==2023-11-06T23:02:40Z
packages.trafficmanager.net_snapshot_debian_20231107T000230Z_dists_bullseye==2023-10-07T11:07:16Z
packages.trafficmanager.net_snapshot_debian_20231107T000230Z_dists_bullseye-backports==2023-11-06T20:17:04Z
packages.trafficmanager.net_snapshot_debian_20231107T000230Z_dists_bullseye-updates==2023-11-06T20:17:05Z
packages.trafficmanager.net_snapshot_debian_20231107T000230Z_dists_buster==2023-06-10T08:53:33Z
packages.trafficmanager.net_snapshot_debian_20231107T000230Z_dists_buster-backports==2023-11-06T20:17:04Z
packages.trafficmanager.net_snapshot_debian_20231107T000230Z_dists_buster-updates==2023-06-10T08:55:10Z
2 changes: 1 addition & 1 deletion files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,7 @@ libplexus-sec-dispatcher-java==1.4-4
libplexus-utils2-java==3.3.0-1
libplexus-velocity-java==1.2-3.1
libpmem1==1.10-2+deb11u1
libpmix2==4.0.0-4.1
libpmix2==4.0.0-4.1+deb11u1
libpng-dev==1.6.37-3
libpng-tools==1.6.37-3
libpng16-16==1.6.37-3
Expand Down
2 changes: 1 addition & 1 deletion files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
View file
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ libplexus-languages-java==0.9.10-1
libplexus-sec-dispatcher-java==1.4-4
libplexus-utils2-java==3.1.1-1
libplexus-velocity-java==1.2-3
libpmix2==3.1.2-3
libpmix2==3.1.2-3+deb10u1
libpng-dev==1.6.36-6
libpng-tools==1.6.36-6
libpng16-16==1.6.36-6
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-swss
Submodule sonic-swss updated 8 files
+1 −0 .gitignore
+38 −3 cfgmgr/teammgr.cpp
+6 −0 neighsyncd/neighsync.cpp
+7 −19 orchagent/muxorch.cpp
+23 −2 tests/mock_tests/Makefile.am
+14 −4 tests/mock_tests/mock_shell_command.cpp
+78 −0 tests/mock_tests/teammgrd/teammgr_ut.cpp
+36 −5 tests/test_mux.py

0 comments on commit e7d6ab2

Please sign in to comment.