Skip to content

Commit 22a193c

Browse files
authored
Merge pull request #922 from mssonicbld/sonicbld/202412-merge
```<br>* aa24d5a - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-buildimage into 202412 (2025-03-18) [Sonic Automation] * bdc62d6 - (head/202411) Update fips openssh to openssh_9.2p1-2+deb12u5 (#22028) (2025-03-18) [mssonicbld] * 89f3bdc - [Mellanox] Remove SKU ACS-SN4280 (#22035) (2025-03-18) [mssonicbld] * a85d973 - [Arista] Change port layout for Arista-7050CX3-32S-C28S4 (#22003) (2025-03-16) [mssonicbld] * fa9c47b - Upgrade xgs SAI to 12.3.2.3 (#22042) (2025-03-14) [zitingguo-ms] * b7f0ca0 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#22040) (2025-03-14) [mssonicbld] * f88aa3a - [dualtor] Fix `mux` start failure due to pre operation timeout (#22027) (2025-03-13) [mssonicbld] * 49146b8 - [submodule] Update submodule sonic-sairedis to the latest HEAD automatically (#22024) (2025-03-13) [mssonicbld] * 54b0e3b - [202411] [Marvell-teralynx] Correction ISAI debian path (#22032) (2025-03-13) [Keshav Gupta] * 8a3dff1 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#22025) (2025-03-13) [mssonicbld] * 9072445 - [rsyslog]: Remote logging with the highest rule priority (#22020) (2025-03-13) [mssonicbld] * 3283497 - [Nokia-7215-A1] Update EZB files for SAI 15.1 (#22004) (2025-03-13) [mssonicbld] * c807b26 - Build fix for ptf-py3 issue on bullseye (#21925) (2025-03-12) [mssonicbld] * be28041 - Use pzstd to compress the Docker in SWI slim images (#22005) (2025-03-12) [mssonicbld] * c371cd3 - [202411]Upgrade SONiC package versions (#21971) (2025-03-11) [mssonicbld] * ad28af8 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#21968) (2025-03-11) [mssonicbld] * 6cb2941 - [YANG] Add yang model to `SUBNET_DECAP` table (#21118) (#21974) (2025-03-11) [Longxiang Lyu] * ef9e911 - [Mellanox] Support new field "supporting_bulk_counter_groups" in DEVICE_METADATA|localhost for Mellanox-SN4280-O28 (#21986) (2025-03-11) [mssonicbld] * 39dbcfd - [SNMP] Fix config template issue when setting snmpagentaddress (#21987) (2025-03-11) [mssonicbld] * 5e6a202 - Merge pull request #21964 from Aravind-Subbaroyan/patch-5 (2025-03-10) [Kumaresh Perumal] |\ | failure_prs.log skip_prs.log e1be5dd - Update cisco-8000.ini (2025-03-07) [Aravind-Subbaroyan] * | 37df4a3 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#21912) (2025-03-08) [mssonicbld] |/ * a414a7f - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#21933) (2025-03-08) [mssonicbld]<br>```
2 parents 2b77c83 + aa24d5a commit 22a193c

24 files changed

+509
-649
lines changed

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O28/buffers_defaults_objects.j2

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{#
2-
Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
2+
SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
3+
Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
34
Apache-2.0
45
56
Licensed under the Apache License, Version 2.0 (the "License");
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../x86_64-nvidia_sn4280-r0/ACS-SN4280/pg_profile_lookup.ini
1+
../Mellanox-SN4700-O8C48/pg_profile_lookup.ini
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../x86_64-nvidia_sn4280-r0/ACS-SN4280/pg_profile_lookup.ini
1+
../Mellanox-SN4700-O8C48/pg_profile_lookup.ini

device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/buffers.json.j2

-18
This file was deleted.

device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/buffers_defaults_objects.j2

-1
This file was deleted.

device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/buffers_defaults_t0.j2

-43
This file was deleted.

device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/buffers_defaults_t1.j2

-44
This file was deleted.

device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/buffers_dynamic.json.j2

-19
This file was deleted.

device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/hwsku.json

-140
This file was deleted.

device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/pg_profile_lookup.ini

-53
This file was deleted.

device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/port_config.ini

-51
This file was deleted.

device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/qos.json.j2

-1
This file was deleted.

0 commit comments

Comments
 (0)