Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding stats to Services and Destinations #2

Merged
merged 2 commits into from
Jan 1, 2017

Conversation

luizbafilho
Copy link
Contributor

This PR adds statistics to Services and Destinations

@mqliang
Copy link
Owner

mqliang commented Dec 30, 2016

@luizbafilho LGTM. Could you please rebase.

@luizbafilho
Copy link
Contributor Author

@mqliang Done!

@mqliang
Copy link
Owner

mqliang commented Dec 31, 2016

@luizbafilho It seems that you merge the master branch into your own branch and submit a pull request, instead of rebasing. You could do a rebase as follows:

  • git remote add upstream https://github.com/mqliang/libipvs.git
  • git remote update
  • git checkout adding-statistics
  • git rebase upstream/master, (and solve conflicts if need)
  • git push -f origin adding-statistics

@luizbafilho
Copy link
Contributor Author

@mqliang thanks for instructions. Done.

@mqliang
Copy link
Owner

mqliang commented Jan 1, 2017

LGTM.

@mqliang mqliang merged commit d00e8a7 into mqliang:master Jan 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants