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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Sep 5, 2023
Merged

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

merged 2 commits into from
Sep 5, 2023

Conversation

mssonicbld
Copy link
Contributor 

* 874ca6806 - (head/202205) Fix issue: set has_timer attribute to true for platform monitor service (#15624) (2023-09-04) [Junchao-Mellanox]<br>```

Junchao-Mellanox and others added 2 commits September 4, 2023 19:38
@Junchao-Mellanox
Fix issue: set has_timer attribute to true for platform monitor servi…
874ca68 
…ce (#15624)

There is a redundant line in init_cfg.json.j2. It would cause pmon service always has "has_timer=False". However, we know that PMON has a timer now. So, I try to fix it here.
@mssonicbld
Merge branch '202205' of https://github.com/sonic-net/sonic-buildimage …
6201b4d 
…into 202205
@mssonicbld mssonicbld requested a review from lguohan as a code owner September 5, 2023 03:01
@mssonicbld mssonicbld merged commit 75e6e1c into Azure:202205 Sep 5, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lguohan lguohan Awaiting requested review from lguohan

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mssonicbld @Junchao-Mellanox