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

bugfix: CLDSRV-282 handle object lock when creating a bucket #4808

Merged

Conversation

miniscruff
Copy link
Contributor

  • auth results can be an array of arrays
  • Object.assign needs an empty object or it modifies the original
  • should be _isObjectLockEnabled not !_isObjectLockEnabled
  • add unit tests

@bert-e
Copy link
Contributor

bert-e commented Sep 22, 2022

Hello miniscruff,

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.

@scality scality deleted a comment from bert-e Sep 22, 2022
* auth results can be an array of arrays
* Object.assign needs an empty object or it modifies the original
* should be `_isObjectLockEnabled` not `!_isObjectLockEnabled`
* add unit tests
@miniscruff miniscruff force-pushed the bugfix/CLDSRV-282/put-bucket-object-lock-regression branch from e161c6f to bbb3e2f Compare September 22, 2022 20:58
@bert-e
Copy link
Contributor

bert-e commented Sep 22, 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

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Sep 22, 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 Sep 22, 2022
@scality scality deleted a comment from bert-e Sep 22, 2022
@scality scality deleted a comment from bert-e Sep 22, 2022
@scality scality deleted a comment from bert-e Sep 22, 2022
Copy link
Contributor

@williamlardier williamlardier left a comment

Choose a reason for hiding this comment

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

LGTM!

@williamlardier
Copy link
Contributor

williamlardier commented Sep 23, 2022

If you need to release the project, feel free to bump the project version, as I am not planning to merge my PR this week 😄

@miniscruff
Copy link
Contributor Author

I will add the bump in the morning, good call

@bert-e
Copy link
Contributor

bert-e commented Sep 23, 2022

Conflict

A conflict has been raised during the update of
integration branch w/7.70/bugfix/CLDSRV-282/put-bucket-object-lock-regression with contents from bugfix/CLDSRV-282/put-bucket-object-lock-regression
and development/7.70.

Please resolve the conflict on the integration branch (w/7.70/bugfix/CLDSRV-282/put-bucket-object-lock-regression).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/7.70/bugfix/CLDSRV-282/put-bucket-object-lock-regression
 $ git pull  # or "git reset --hard origin/w/7.70/bugfix/CLDSRV-282/put-bucket-object-lock-regression"
 $ git merge origin/development/7.70
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/bugfix/CLDSRV-282/put-bucket-object-lock-regression
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/CLDSRV-282/put-bucket-object-lock-regression

@bert-e
Copy link
Contributor

bert-e commented Sep 23, 2022

Waiting for approval

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

  • the author

  • 2 peers

@miniscruff
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Sep 23, 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 Sep 23, 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-282.

Goodbye miniscruff.

@bert-e bert-e merged commit 9e76f3b into development/7.10 Sep 23, 2022
@bert-e bert-e deleted the bugfix/CLDSRV-282/put-bucket-object-lock-regression branch September 23, 2022 20:29
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