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

Backport 1.2.1 - Topbeat #1338

Merged
merged 2 commits into from
Apr 7, 2016
Merged

Conversation

andrewkroh
Copy link
Member

Backport of #845 to 1.2 - Add username to Topbeat
Backport of #1128 to 1.2 - Change Cpu.Get() on Windows to not use floating point arithmetic

My second or third attempt at getting this into 1.x. 😁

@andrewkroh
Copy link
Member Author

jenkins, test it

@tsg
Copy link
Contributor

tsg commented Apr 7, 2016

Should add proc.username to fields.yml.

@tsg
Copy link
Contributor

tsg commented Apr 7, 2016

I'm merging this for testing.

@tsg tsg merged commit 1e2ad31 into elastic:1.2 Apr 7, 2016
@tsg
Copy link
Contributor

tsg commented Apr 7, 2016

Tested on OS X, Windows and Linux, all doing fine. Thank you @andrewkroh, third time's the charm :)

@andrewkroh andrewkroh deleted the backport/1.2-topbeat-username branch April 19, 2016 15:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants