cloudserver icon indicating copy to clipboard operation
cloudserver copied to clipboard

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

Open miniscruff opened this issue 3 years ago • 5 comments

  • 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 avatar Sep 22 '22 20:09 miniscruff

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.

bert-e avatar Sep 22 '22 20:09 bert-e

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 avatar Sep 22 '22 20:09 bert-e

Waiting for approval

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

  • the author

  • 2 peers

bert-e avatar Sep 22 '22 20:09 bert-e

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 :smile:

williamlardier avatar Sep 23 '22 08:09 williamlardier

I will add the bump in the morning, good call

miniscruff avatar Sep 23 '22 08:09 miniscruff

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 avatar Sep 23 '22 18:09 bert-e

Waiting for approval

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

  • the author

  • 2 peers

bert-e avatar Sep 23 '22 18:09 bert-e

/approve

miniscruff avatar Sep 23 '22 20:09 miniscruff

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:

  • :heavy_check_mark: development/7.10

  • :heavy_check_mark: development/7.70

  • :heavy_check_mark: development/8.4

  • :heavy_check_mark: 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 avatar Sep 23 '22 20:09 bert-e

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

  • :heavy_check_mark: development/7.10

  • :heavy_check_mark: development/7.70

  • :heavy_check_mark: development/8.4

  • :heavy_check_mark: 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 avatar Sep 23 '22 20:09 bert-e