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.

Sign up for GitHub

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

Jump to bottom

feat(bitmap): use enhanced bitmap from go-common-libs (backport #625) #674

Merged
merged 1 commit into from
Sep 18, 2024
Merged

feat(bitmap): use enhanced bitmap from go-common-libs (backport #625) #674

merged 1 commit into from
Sep 18, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 16, 2024 •
edited by james-munson
Loading

Which issue(s) this PR fixes:

Backport issue longhorn/longhorn#9474

What this PR does / why we need it:

Switch to use the enhanced bitmap utility to avoid immediate reuse and port collision.

Special notes for your reviewer:

Additional documentation or context

This is an automatic backport of pull request #625 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Sep 16, 2024
@mergify Mergify
Copy link
Author

mergify bot commented Sep 16, 2024

Cherry-pick of 01ea03a has failed:

On branch mergify/bp/v1.7.x/pr-625
Your branch is up to date with 'origin/v1.7.x'.

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

Changes to be committed:
	modified:   pkg/process/process_manager.go
	deleted:    pkg/util/bitmap.go
	deleted:    pkg/util/bitmap_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   vendor/modules.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Sep 16, 2024
Merged
@james-munson
feat(bitmap): use enhanced bitmap from go-common-libs
2038b7c 
Signed-off-by: James Munson <james.munson@suse.com>
(cherry picked from commit 01ea03a)

# Conflicts:
#	go.mod
#	go.sum
#	vendor/modules.txt
@mergify mergify bot merged commit 6fc115c into v1.7.x Sep 18, 2024
9 checks passed
@mergify mergify bot deleted the mergify/bp/v1.7.x/pr-625 branch September 18, 2024 23:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PhanLe1010 PhanLe1010 PhanLe1010 approved these changes

@james-munson james-munson james-munson approved these changes

@derekbit derekbit Awaiting requested review from derekbit

Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@PhanLe1010 @james-munson