search

contiv / contiv.github.io

Contiv website source code
http://contiv.github.io/
Other
3 stars 65 forks source link

update service load balancer feature document #165

Open g1rana opened 7 years ago

g1rana commented 7 years ago

Add section to configure service load balancer using netctl

dseevr commented 7 years ago

Don't forget to run make in the websrc directory to generate the static files and then commit them, too.

Please see: https://github.com/contiv/contiv.github.io/blob/6ef851da93c6ae22cc99057c639a308801e7932f/CONTRIBUTING.md#submitting-changes

dseevr commented 7 years ago

The changes look fine, but could you merge all these commits into one using git rebase -i? Lemme know if you need help with that

dseevr commented 6 years ago

Actually, I can just have these combined into one commit when I merge it lol

@g1rana is this ready to go or are there more changes to be made?

dseevr commented 6 years ago

@g1rana do we still want to merge this?

To resolve the conflict, just delete sitemap.xml on your branch, rebase against the latest changes on master, then re-run make and commit everything