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

Revert "Add thermal control support for SONiC (#3949)" #4527

Merged
merged 1 commit into from
May 4, 2020

Conversation

nazariig
Copy link
Collaborator

@nazariig nazariig commented May 4, 2020

This reverts commit 109a13c.

Conflicts:
dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2

- Why I did it

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

This reverts commit 109a13c.

Conflicts:
	dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
@lgtm-com
Copy link

lgtm-com bot commented May 4, 2020

This pull request fixes 4 alerts when merging aec9ba3 into fed5009 - view on LGTM.com

fixed alerts:

  • 3 for 'import *' may pollute namespace
  • 1 for Unused import

@lguohan
Copy link
Collaborator

lguohan commented May 4, 2020

why revert?

@volodymyrsamotiy
Copy link
Collaborator

why revert?

Temporarly revert this PR, since not all related PRs were cherry-picked to 201911 sub-modules (or maybe sub-module pointers were not update in 201911).
And this caused build to fail (e.g. https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/buildimage-mlnx-201911/84/console)
First need to make sure that all other PRs, which needed for this one, are cherry-picked to appropriate sub-modules and also sub-module pointers are updated. Then this one can be returned back.

@liat-grozovik liat-grozovik merged commit c266435 into sonic-net:201911 May 4, 2020
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