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

Fix pymodbus TLS module conflicts in 3.0.0 #661

Merged
merged 1 commit into from
Aug 9, 2021

Conversation

starnight
Copy link
Contributor

@starnight starnight commented Aug 8, 2021

Developers add/fix features at the same time, then produce the conflicts
in pymodbus' TLS module. This patch tries to fix the conflicts.

Developers add/fix features at the same time, then produce the conflicts
in pymodbus' TLS module. This patch tries to fix the conflicts.
@sonarqubecloud
Copy link

sonarqubecloud bot commented Aug 8, 2021

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@starnight starnight mentioned this pull request Aug 8, 2021
@dhoomakethu dhoomakethu merged commit e6674ec into pymodbus-dev:3.0.0 Aug 9, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants