Closed pierantoniomerlino closed 1 month ago
The backport to release-5.6.0
failed:
The process '/usr/bin/git' failed with exit code 1
To backport manually, run these commands in your terminal:
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-5.6.0 release-5.6.0
# Navigate to the new working tree
cd .worktrees/backport-release-5.6.0
# Create a new branch
git switch --create backport-5378-to-release-5.6.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e310e93616d69c7c38200b9dc9c166ec24b9ff48
# Push it to GitHub
git push --set-upstream origin backport-5378-to-release-5.6.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-5.6.0
Then, create a pull request where the base
branch is release-5.6.0
and the compare
/head
branch is backport-5378-to-release-5.6.0
.
This PR changes the selection order of the DHCP servers.
Related Issue: This PR fixes/closes N/A
Description of the solution adopted: Since
isc-dhcp-server
will be deprecated, we decided to preferdnsmasq
andudhcpd
instead ofdhcpd
in the automatic selection of the DHCP servers in theDhcpServerManager
class.