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

object: fix search user in objectstore (backport #9143) #9246

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 24, 2021

This is an automatic backport of pull request #9143 done by Mergify.
Cherry-pick of 184f2fd has failed:

On branch mergify/bp/release-1.7/pr-9143
Your branch is up to date with 'origin/release-1.7'.

You are currently cherry-picking commit 184f2fdb3.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/operator/ceph/object/objectstore.go

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of e06c6fc has failed:

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

You are currently cherry-picking commit e06c6fc3e.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/operator/ceph/object/objectstore.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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

avoid failed reconcile when multiple multisite objectstore are configured

Signed-off-by: Olivier Bouffet <olivier.bouffet@infomaniak.com>
(cherry picked from commit 184f2fd)

# Conflicts:
#	pkg/operator/ceph/object/objectstore.go
adding zonegroup and zone args to avoid failed reconcile

Signed-off-by: Olivier Bouffet <olivier.bouffet@infomaniak.com>
(cherry picked from commit e06c6fc)

# Conflicts:
#	pkg/operator/ceph/object/objectstore.go
@mergify mergify bot added the conflicts label Nov 24, 2021
@leseb
Copy link
Member

leseb commented Nov 29, 2021

@olivierbouffet would you mind sending a PR against the release-1.7 that fixes the conflicts? Thanks!

@travisn
Copy link
Member

travisn commented Dec 2, 2021

@olivierbouffet would you mind sending a PR against the release-1.7 that fixes the conflicts? Thanks!

This is already in release-1.7 with the original PR #9143, no need for the backport

@travisn travisn closed this Dec 2, 2021
@mergify mergify bot deleted the mergify/bp/release-1.7/pr-9143 branch December 2, 2021 20: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.

None yet

3 participants