contiv / netplugin

Container networking for various use cases
Apache License 2.0
514 stars 177 forks source link

Modified that check burst value when run the function ValidateNetprofile #1138

Closed wangxf1987 closed 6 years ago

wangxf1987 commented 6 years ago

Description of the changes

Type of fix: Bug Fix

Fixes #1137

Please describe:

TODO

dseevr commented 6 years ago

You will need to rebase your code on the latest master code in the netplugin repo. You are missing about ~9 commits that exist on our master branch

wangxf1987 commented 6 years ago

OK, I will be fix. and commit again.

dseevr commented 6 years ago

You can git rebase master on this branch and force push to Github. You don't need to open a new PR to make changes

wangxf1987 commented 6 years ago

@dseevr I will be push the change to the master branch directly, right?

dseevr commented 6 years ago

You push to the remote/branch you used to open the PR. In the case of #1139, it's wangxf1987/master

The general workflow is:

  1. Clone the original repo
  2. Fork the repo to your username
  3. Add your fork as a git remote: git remote add yourusername git@github.com:yourusername/netplugin.git
  4. Check out a local feature branch: git checkout -b feature_branch
  5. Add your commits
  6. Push the branch to your remote and set it to track your local branch: git push -u yourusername feature_branch
  7. Open the PR against the master branch in the main repo

To edit the PR, just edit feature_branch locally and git push your changes. If there are new changes on the main repo since you created your feature branch, you can: git checkout master && git pull && git checkout feature_branch && git rebase master. After you resolve merge conflicts (if there any), you can git push -f to overwrite your branch on github (-f is necessary because you have altered history on your branch). If you just add a new commit on top of your existing commits, you can just run git push to update your branch on github.

wangxf1987 commented 6 years ago

@liucimin thx, cimin. @dseevr I have to renew a PR, because my local repo and fork repo already has been remove. so the PR head fork that show unknown repository. Please help me delete or close #1138 #1139. thanks again.

dseevr commented 6 years ago

You can close your own Pull Requests. Just click "Close Pull Request" at the bottom right.