Skip to content

Removed the conflict on Network Manager #523

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

Open
Rezi1999 wants to merge 1 commit into
base: 5.3.0
Choose a base branch
from
Open

Removed the conflict on Network Manager #523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions toolkit/perfsonar-toolkit/unibuild-packaging/deb/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,10 @@ Description: perfSONAR Toolkit firewall configuration
Package: perfsonar-toolkit-sysctl
Architecture: all
Depends: libperfsonar-perl, ${perl:Depends}, ${misc:Depends}
Conflicts: network-manager
Description: perfSONAR Toolkit sysctl configuration
Configures sysctl settings for perfSONAR Toolkit.
These settings are tuning the network stack.
Conflicts with network-manager.


Package: perfsonar-toolkit-ntp
Architecture: all
Depends: time-daemon, perfsonar-toolkit-library,
Expand Down