Fix failing slapos master due to my merge of monitor stack in erp5 software release
The slapos master use different instance-erp5 and instance-balancer than erp5 software release. So I included the monitor changes there as well to fix the issue
The slapos master use different instance-erp5 and instance-balancer than erp5 software release. So I included the monitor changes there as well to fix the issue
Step 1. Fetch and check out the branch for this merge request
git fetch "https://lab.nexedi.com/hjuneja/slapos.git" "fix-master" git checkout -b "hjuneja/slapos-fix-master" 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 "hjuneja/slapos-fix-master"
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.