Merge branch '202205' of https://github.com/sonic-net/sonic-buildimage …

…into 202205
mlok-nokia · Oct 18, 2023 · 40582f4 · 40582f4
2 parents ba01aa4 + 2639fa7
commit 40582f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
diff --git a/src/sonic-swss b/src/sonic-swss
+49 −30		sonic-thermalctld/scripts/thermalctld
+48 −20		sonic-thermalctld/tests/test_thermalctld.py