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

bf(CLDSRV-250): Set replication status to PENDING when putting an ACL #4689

Merged
merged 2 commits into from
Jul 26, 2022

Conversation

tmacro
Copy link
Contributor

@tmacro tmacro commented Jul 26, 2022

rollback changes to objectPutACL and associated tests

@bert-e
Copy link
Contributor

bert-e commented Jul 26, 2022

Hello tmacro,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Jul 26, 2022

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e
Copy link
Contributor

bert-e commented Jul 26, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@scality scality deleted a comment from bert-e Jul 26, 2022
@scality scality deleted a comment from bert-e Jul 26, 2022
@scality scality deleted a comment from bert-e Jul 26, 2022
Copy link
Contributor

@jonathan-gramain jonathan-gramain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

may be useful to add a reference to the commit from which the roll back comes from

tmacro added 2 commits July 26, 2022 13:55
Rollback objectPutACL changes from - feature: CLDSRV-162 use metadata and data from new arsenal fbd68e6
@tmacro tmacro force-pushed the bugfix/CLDSRV-250/fix_acl_replication branch from 7199e45 to 49a9146 Compare July 26, 2022 20:57
@bert-e
Copy link
Contributor

bert-e commented Jul 26, 2022

History mismatch

Merge commit #15ec570827c24065e491629a9e3ffc992ec604cd on the integration branch
w/7.70/bugfix/CLDSRV-250/fix_acl_replication is merging a branch which is neither the current
branch bugfix/CLDSRV-250/fix_acl_replication nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-250/fix_acl_replication and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@tmacro
Copy link
Contributor Author

tmacro commented Jul 26, 2022

/reset

@bert-e
Copy link
Contributor

bert-e commented Jul 26, 2022

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Jul 26, 2022

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e
Copy link
Contributor

bert-e commented Jul 26, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@tmacro
Copy link
Contributor Author

tmacro commented Jul 26, 2022

/approve

@bert-e
Copy link
Contributor

bert-e commented Jul 26, 2022

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.4

  • ✔️ development/8.5

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jul 26, 2022

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.4

  • ✔️ development/8.5

The following branches have NOT changed:

  • development/6.4
  • development/7.4

Please check the status of the associated issue CLDSRV-250.

Goodbye tmacro.

@bert-e bert-e merged commit 49a9146 into development/7.10 Jul 26, 2022
@bert-e bert-e deleted the bugfix/CLDSRV-250/fix_acl_replication branch July 26, 2022 21:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants