WIP: erp5: include generic hostnames in $HOSTS
Otherwise, hostnames such as localhost or this machine hostname will be resolved by DNS server. Some DNS servers ( for example 208.67.222.222 or 8.8.8.8, but 1.1.1.1 does ) do not resolve localhost.
Otherwise, hostnames such as localhost or this machine hostname will be resolved by DNS server. Some DNS servers ( for example 208.67.222.222 or 8.8.8.8, but 1.1.1.1 does ) do not resolve localhost.
Step 1. Fetch and check out the branch for this merge request
git fetch "https://lab.nexedi.com/jerome/slapos.git" "feat/erp5_default_hosts" git checkout -b "jerome/slapos-feat/erp5_default_hosts" 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 "jerome/slapos-feat/erp5_default_hosts"
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.