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 #143) #152

Merged
merged 2 commits into from
Mar 7, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 7, 2024

This is an automatic backport of pull request #143 done by Mergify.
Cherry-pick of 6e921c6 has failed:

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

You are currently cherry-picking commit 6e921c6.
  (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/server/share_manager.go
	new file:   vendor/github.com/longhorn/go-common-libs/utils/mount.go
	modified:   vendor/google.golang.org/grpc/internal/transport/transport.go
	modified:   vendor/google.golang.org/grpc/resolver/resolver.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   vendor/github.com/longhorn/go-common-libs/io/file.go
	deleted by us:   vendor/github.com/longhorn/go-common-libs/types/file.go
	both modified:   vendor/google.golang.org/grpc/clientconn.go
	deleted by us:   vendor/google.golang.org/grpc/resolver_wrapper.go
	both modified:   vendor/google.golang.org/grpc/rpc_util.go
	both modified:   vendor/google.golang.org/grpc/server.go
	both modified:   vendor/google.golang.org/grpc/version.go
	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 6e921c6)

# Conflicts:
#	go.mod
#	go.sum
#	vendor/github.com/longhorn/go-common-libs/io/file.go
#	vendor/github.com/longhorn/go-common-libs/types/file.go
#	vendor/google.golang.org/grpc/clientconn.go
#	vendor/google.golang.org/grpc/resolver_wrapper.go
#	vendor/google.golang.org/grpc/rpc_util.go
#	vendor/google.golang.org/grpc/server.go
#	vendor/google.golang.org/grpc/version.go
#	vendor/modules.txt
@mergify mergify bot requested a review from a team as a code owner March 7, 2024 10:50
@mergify mergify bot added the conflicts label Mar 7, 2024
Copy link
Author

mergify bot commented Mar 7, 2024

Cherry-pick of 6e921c6 has failed:

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

You are currently cherry-picking commit 6e921c6.
  (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/server/share_manager.go
	new file:   vendor/github.com/longhorn/go-common-libs/utils/mount.go
	modified:   vendor/google.golang.org/grpc/internal/transport/transport.go
	modified:   vendor/google.golang.org/grpc/resolver/resolver.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   vendor/github.com/longhorn/go-common-libs/io/file.go
	deleted by us:   vendor/github.com/longhorn/go-common-libs/types/file.go
	both modified:   vendor/google.golang.org/grpc/clientconn.go
	deleted by us:   vendor/google.golang.org/grpc/resolver_wrapper.go
	both modified:   vendor/google.golang.org/grpc/rpc_util.go
	both modified:   vendor/google.golang.org/grpc/server.go
	both modified:   vendor/google.golang.org/grpc/version.go
	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

Signed-off-by: Jack Lin <jack.lin@suse.com>
@innobead innobead self-requested a review March 7, 2024 11:31
@innobead innobead merged commit 4179450 into v1.5.x Mar 7, 2024
3 checks passed
@innobead innobead deleted the mergify/bp/v1.5.x/pr-143 branch March 7, 2024 11:31
@ChanYiLin
Copy link
Contributor

ref: longhorn/longhorn#8125

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants