Skip to content
This repository has been archived by the owner on Aug 20, 2024. It is now read-only.

Find Heap Bound (bp #1648) #1681

Merged
merged 4 commits into from
Oct 13, 2020
Merged

Find Heap Bound (bp #1648) #1681

merged 4 commits into from
Oct 13, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 10, 2020

This is an automated backport of pull request #1648 done by Mergify

Cherry-pick of f7ae514 has failed:

On branch mergify/bp/1.2.x/pr-1648
Your branch is ahead of 'origin/1.2.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f7ae514f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	new file:   benchmark/scripts/find_heap_bound.py
	modified:   benchmark/scripts/monitor_job.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   .travis.yml

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the simulator.

Finally, you can contact us on https://mergify.io/

This provides a common Python interfaces for monitoring resource usage
of subprocesses

Co-authored-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
(cherry picked from commit 038faf9)
Co-authored-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
(cherry picked from commit f7ae514)

# Conflicts:
#	.travis.yml
@mergify mergify bot requested a review from a team as a code owner June 10, 2020 19:19
@mergify mergify bot added bp-conflict Backport Automated backport, please consider for minor release labels Jun 10, 2020
@jackkoenig jackkoenig self-assigned this Oct 13, 2020
@mergify mergify bot merged commit b01db5e into 1.2.x Oct 13, 2020
@mergify mergify bot deleted the mergify/bp/1.2.x/pr-1648 branch October 13, 2020 21:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Backport Automated backport, please consider for minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant