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

Mergeback #8

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Mergeback #8

wants to merge 17 commits into from

Conversation

phax
Copy link

@phax phax commented Sep 23, 2022

Hi guys,
Please find attached some try to merge the changes back to the original version.
Hopy you find it useful :)

Copy link

@luk3thomas luk3thomas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR!


public class CpuProfileResourceTest {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please adhere to the code style that was here before, rather than reformatting to change the spacing, indentation, and curly braces placement.

LICENSE Outdated
@@ -1,13 +1,176 @@
Copyright 2015 Papertrail, Inc.
Apache License

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert the licensing change

@phax
Copy link
Author

phax commented Sep 28, 2022

License has been reverted.
Please fix the identation yourself - you know your code formatter best. I don't have the time to play with this - it's just 2 files.... thanks for understanding

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.

2 participants