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

Reflect max-packet-size change on website example #28

Merged
merged 1 commit into from
Apr 26, 2014
Merged

Reflect max-packet-size change on website example #28

merged 1 commit into from
Apr 26, 2014

Conversation

NeQuissimus
Copy link

See #27

@ivantopo
Copy link
Contributor

Tim, thanks for the help! I need to ask you three things:

  • Amend the commit message to something like "! site: reflect max-packet-size change on website example".. since a few weeks ago we are trying to follow the same commit message guidelines as spray [1], this will help us make better release notes with each release.
  • Update the comment above the setting too, to reflect the same comment we have in the reference.conf file.

[1] http://spray.io/project-info/contributing/#git-commit-messages

@NeQuissimus
Copy link
Author

I hope this is good enough, I messed git up a bit :) No idea how to squash those commits properly...

What is the third thing you need me to do? You only listed two...

@ivantopo
Copy link
Contributor

The third thing was squashing the changes into a single commit! As a resume, do the following:

  • git rebase -i HEAD~5 (where 5 means that you want to rebase the last 5 commits)
  • A editor will open up listing all the commits, leave the first one with "pick" and "squash" for the rest. Save and close.
  • A new editor will open, this time asking you for the commit message. Make sure the only not commented line contains the desired commit message.
  • git push --force to your branch on github. This will automatically update your pull request to reflect a single commit :).

This might help too: https://help.github.com/articles/interactive-rebase

@NeQuissimus
Copy link
Author

Aha! Thanks for the help. I had tried this earlier but must have done the second editor step wrong.

ivantopo added a commit that referenced this pull request Apr 26, 2014
Reflect max-packet-size change on website example
@ivantopo ivantopo merged commit 657e367 into kamon-io:master Apr 26, 2014
@NeQuissimus NeQuissimus deleted the statsdbytes branch April 26, 2014 18:37
ivantopo added a commit that referenced this pull request Mar 9, 2020
…-advice

move appender loop instrumentation from interceptor to advice, fixes #28
ivantopo added a commit that referenced this pull request Mar 9, 2020
ivantopo added a commit that referenced this pull request Mar 18, 2020
Settable context mixin for SystemMessages
ivantopo added a commit that referenced this pull request Mar 29, 2020
Adding an config option to include http status code as metric tag
ivantopo added a commit that referenced this pull request Mar 29, 2020
…#28 (#32)

* run WSClient instrumentation only once when filters are applied, fixes #28
* instrument WSClient.url(..) instead of WSRequestExecutor
* instrument WSRequest instead of the ning-specific implementation
* fix compilation error for 2.6/Scala 2.11
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