search

contiv / contiv.github.io

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

Adding bandwidth info in advanced contiv tutorial #124

Closed gaurav-dalvi closed 7 years ago

gaurav-dalvi commented 7 years ago

Adding bandwidth section in advanced tutorial.

Signed-off-by: Gaurav Dalvi gaurav1424@gmail.com

gaurav-dalvi commented 7 years ago

Thanks @neelimamukiri for review. Its done.

dseevr commented 7 years ago

@gaurav-dalvi resolve this merge conflict in sitemap.xml by just git add sitemap.xml && git rebase --continue then just re-run make (which will overwrite the file anyways) and git commit -a --amend --no-edit && git push -f. No need to try to manually resolve it

gaurav-dalvi commented 7 years ago

@dseevr : Please check. I did 

git commit --amend --no-edit
git push -f origin bandiwdth
dseevr commented 7 years ago

@gaurav-dalvi still seeing a merge conflict in sitemap.xml ... did you pull on master before you rebased against it?

dseevr commented 7 years ago

@neelimamukiri any more comments here?