Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205 #116

Merged
merged 4 commits into from
Sep 23, 2023

Conversation

mssonicbld
Copy link
Collaborator

* 5eed2054f - (head/202205) Update Broadcom DNX SAI version to 7.1.60.4-1 (#16660) (2023-09-22) [judyjoseph]
* 7558d0361 - [202205] Assign altname for bridge interface on chassis and iptables rules update to allow traffic on it. (#16504) (2023-09-22) [abdosi]
* 6ebfa3b34 - [cisco]: Update cisco-8000.ini (#16656) (2023-09-21) [James An]<br>```

jamesan47 and others added 4 commits September 21, 2023 23:02
Why I did it

Release Notes for 8102-64H
• Fix NHG drop when route is added before members are added (MIGSMSFT-333 / SR 696141124)
• Added a new system device property "acl_set_dscp_encap_outer_only"
• IN_DISCARD counters report back per-port counters only instead of all counters that are per-port and also that are shared.

How I did it

Update platform version to 202205.2.2.12
…rules update to allow traffic on it. (#16504)

What I did:
Fixes: #16468

Why I did:
On Some chassis there is no dedicated eth1-midplane interface on supervisor for supervisor and LC communication but instead Linux bridge br1 is used for that. Because of this changes that were done to white-list traffic over eth1-midplane would not work.

How I did:
To fix this we are using altname property of ip link command to set eth1-midplane as altname of br interface. This is done to keep design generic across chassis and between supervisor and LC also. IP-table rules are updated to get parent/base interface name of eth1-midplane.

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
@mssonicbld mssonicbld requested a review from lguohan as a code owner September 23, 2023 03:01
@mssonicbld mssonicbld merged commit 96b41cb into Azure:202205 Sep 23, 2023
3 checks passed
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request Sep 25, 2023
…atically (#15421)

src/sonic-telemetry

* 19ca64a - (HEAD -> 202205, origin/202205) Merge pull request Azure#116 from zbud-msft/fix_azp_202205 (2 days ago) [Ying Xie]
* 810ee03 - Update .netcore pkg (3 days ago) [zbud-msft]
* 5bfcb7d - Fix azp file (3 days ago) [zbud-msft]
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
…automatically (#15549)

#### Why I did it
src/sonic-mgmt-framework
```
* 4a2ff41 - (HEAD -> master, origin/master, origin/HEAD) [actions] Support Semgrep by Github Actions (Azure#116) (5 hours ago) [Mai Bui]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants