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

refactor(utils): move is mount read only function to common lib (backport #418) #423

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 7, 2024

This is an automatic backport of pull request #418 done by Mergify.
Cherry-pick of 9ad8b7a has failed:

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

You are currently cherry-picking commit 9ad8b7a.
  (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
	modified:   vendor/github.com/longhorn/go-common-libs/io/file.go
	modified:   vendor/github.com/longhorn/go-common-libs/types/file.go
	new file:   vendor/github.com/longhorn/go-common-libs/utils/mount.go
	modified:   vendor/github.com/longhorn/go-spdk-helper/pkg/spdk/client/basic.go
	modified:   vendor/google.golang.org/grpc/clientconn.go
	modified:   vendor/google.golang.org/grpc/internal/transport/transport.go
	modified:   vendor/google.golang.org/grpc/resolver/resolver.go
	modified:   vendor/google.golang.org/grpc/resolver_wrapper.go
	modified:   vendor/google.golang.org/grpc/rpc_util.go
	modified:   vendor/google.golang.org/grpc/server.go
	modified:   vendor/google.golang.org/grpc/version.go
	modified:   vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go
	modified:   vendor/k8s.io/apimachinery/pkg/util/validation/field/errors.go
	modified:   vendor/k8s.io/apimachinery/pkg/util/wait/loop.go
	modified:   vendor/k8s.io/apimachinery/pkg/util/wait/poll.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 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 config editor.

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

ref: longhorn/longhorn 7394

Signed-off-by: Jack Lin <jack.lin@suse.com>
(cherry picked from commit 9ad8b7a)

# Conflicts:
#	go.mod
#	go.sum
#	vendor/modules.txt
@mergify mergify bot requested a review from a team as a code owner March 7, 2024 06:59
Copy link
Author

mergify bot commented Mar 7, 2024

Cherry-pick of 9ad8b7a has failed:

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

You are currently cherry-picking commit 9ad8b7a.
  (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
	modified:   vendor/github.com/longhorn/go-common-libs/io/file.go
	modified:   vendor/github.com/longhorn/go-common-libs/types/file.go
	new file:   vendor/github.com/longhorn/go-common-libs/utils/mount.go
	modified:   vendor/github.com/longhorn/go-spdk-helper/pkg/spdk/client/basic.go
	modified:   vendor/google.golang.org/grpc/clientconn.go
	modified:   vendor/google.golang.org/grpc/internal/transport/transport.go
	modified:   vendor/google.golang.org/grpc/resolver/resolver.go
	modified:   vendor/google.golang.org/grpc/resolver_wrapper.go
	modified:   vendor/google.golang.org/grpc/rpc_util.go
	modified:   vendor/google.golang.org/grpc/server.go
	modified:   vendor/google.golang.org/grpc/version.go
	modified:   vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go
	modified:   vendor/k8s.io/apimachinery/pkg/util/validation/field/errors.go
	modified:   vendor/k8s.io/apimachinery/pkg/util/wait/loop.go
	modified:   vendor/k8s.io/apimachinery/pkg/util/wait/poll.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

@ChanYiLin
Copy link
Contributor

Will manually backported it

@ChanYiLin ChanYiLin closed this Mar 7, 2024
@mergify mergify bot deleted the mergify/bp/v1.6.x/pr-418 branch March 7, 2024 10:31
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.

1 participant