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

Fix haproxy plugin to include missing slim metric #2133

Closed
wants to merge 1 commit into from

Conversation

cabillman
Copy link

@cabillman cabillman commented Dec 7, 2016

Required for all PRs:

  • CHANGELOG.md updated (we recommend not updating this until the PR has been approved by a maintainer)
  • Sign CLA (if not already signed)

Issue #2132

@cabillman cabillman changed the base branch from release-1.1.0 to master December 7, 2016 15:47
@sparrc
Copy link
Contributor

sparrc commented Dec 7, 2016

looks fine but you need to fix your rebase/merge to not include all of these irrelevant commits. Also, your changelog update should be in 1.2 not 1.1

@cabillman
Copy link
Author

@sparrc How does that look?

@krzysztof-indyk
Copy link
Contributor

It duplicates #1937

@sparrc
Copy link
Contributor

sparrc commented Dec 13, 2016

oh, right, woops, this has already been fixed, see #1937

@sparrc sparrc closed this Dec 13, 2016
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.

3 participants