erp5testnode: Add the protocol name to nat-rule-port
Now the nat-rule-port always has the protocol name, see here: https://lab.nexedi.com/nexedi/slapos/blob/9a886c4b0c6dd229564292eaa0ef2604fa857aea/software/kvm/instance-kvm.cfg.jinja2#L843
Now the nat-rule-port always has the protocol name, see here: https://lab.nexedi.com/nexedi/slapos/blob/9a886c4b0c6dd229564292eaa0ef2604fa857aea/software/kvm/instance-kvm.cfg.jinja2#L843
Step 1. Fetch and check out the branch for this merge request
git fetch "https://lab.nexedi.com/Daetalus/slapos.git" "eggs" git checkout -b "Daetalus/slapos-eggs" FETCH_HEAD
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout "origin/master" git merge --no-ff "Daetalus/slapos-eggs"
Step 4. Push the result of the merge to GitLab
git push origin "master"
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.
This will create a new commit in order to revert the existing changes.