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

Add missing procstat items for FreeBSD #2561

Merged
merged 1 commit into from
Nov 24, 2021

Conversation

GuillaumeGomez
Copy link
Member

No description provided.

@GuillaumeGomez GuillaumeGomez force-pushed the procstat-items branch 8 times, most recently from 6c84b0c to 03d1fe4 Compare November 22, 2021 13:30
@GuillaumeGomez
Copy link
Member Author

CI passed. \o/

r? @JohnTitor

@bors
Copy link
Contributor

bors commented Nov 23, 2021

☔ The latest upstream changes (presumably #2556) made this pull request unmergeable. Please resolve the merge conflicts.

@GuillaumeGomez GuillaumeGomez changed the title Add missing procstat items Add missing procstat items for FreeBSD Nov 23, 2021
@GuillaumeGomez
Copy link
Member Author

Rebased.

@JohnTitor
Copy link
Member

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Nov 24, 2021

📌 Commit 4297ec1 has been approved by JohnTitor

@bors
Copy link
Contributor

bors commented Nov 24, 2021

⌛ Testing commit 4297ec1 with merge 89ead98...

@bors
Copy link
Contributor

bors commented Nov 24, 2021

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: JohnTitor
Pushing 89ead98 to master...

@bors bors merged commit 89ead98 into rust-lang:master Nov 24, 2021
@GuillaumeGomez GuillaumeGomez deleted the procstat-items branch November 24, 2021 09:55
@bors bors mentioned this pull request Nov 24, 2021
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.

None yet

3 participants