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

impr(CLDSRV-475): Add isDeleteMarker to overhead fields #5519

Conversation

tmacro
Copy link
Contributor

@tmacro tmacro commented Jan 8, 2024

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Jan 8, 2024

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.

@scality scality deleted a comment from bert-e Jan 8, 2024
@bert-e
Copy link
Contributor

bert-e commented Jan 8, 2024

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@tmacro
Copy link
Contributor Author

tmacro commented Jan 8, 2024

/create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jan 8, 2024

Integration data created

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

The following branches will NOT be impacted:

  • development/7.10
  • 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

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jan 8, 2024

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jan 10, 2024

Conflict

There is a conflict between your branch improvement/CLDSRV-475/add_overhead_fields_for_suspended_versioning and the
destination branch development/7.70.

Please resolve the conflict on the feature branch (improvement/CLDSRV-475/add_overhead_fields_for_suspended_versioning).

git fetch && \
git checkout origin/improvement/CLDSRV-475/add_overhead_fields_for_suspended_versioning && \
git merge origin/development/7.70

Resolve merge conflicts and commit

git push origin HEAD:improvement/CLDSRV-475/add_overhead_fields_for_suspended_versioning

The following options are set: create_integration_branches

@tmacro tmacro force-pushed the improvement/CLDSRV-475/add_overhead_fields_for_suspended_versioning branch from fdd6bba to 1a21c4f Compare January 10, 2024 18:03
@bert-e
Copy link
Contributor

bert-e commented Jan 10, 2024

History mismatch

Merge commit #cfed3a4462fbbd8923eeec9741f0f1439710b99f on the integration branch
w/8.6/improvement/CLDSRV-475/add_overhead_fields_for_suspended_versioning is merging a branch which is neither the current
branch improvement/CLDSRV-475/add_overhead_fields_for_suspended_versioning nor the development branch
development/8.6.

It is likely due to a rebase of the branch improvement/CLDSRV-475/add_overhead_fields_for_suspended_versioning 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.

The following options are set: create_integration_branches

@tmacro
Copy link
Contributor Author

tmacro commented Jan 10, 2024

/reset

@bert-e
Copy link
Contributor

bert-e commented Jan 10, 2024

Reset complete

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

The following options are set: create_integration_branches

@scality scality deleted a comment from bert-e Jan 10, 2024
@bert-e
Copy link
Contributor

bert-e commented Jan 10, 2024

Integration data created

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

The following branches will NOT be impacted:

  • development/7.10
  • 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

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jan 10, 2024

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_integration_branches

@tmacro
Copy link
Contributor Author

tmacro commented Jan 10, 2024

/approve

@bert-e
Copy link
Contributor

bert-e commented Jan 10, 2024

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.70

  • ✔️ development/8.6

  • ✔️ development/8.7

  • ✔️ development/8.8

The following branches will NOT be impacted:

  • development/7.10
  • 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, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jan 10, 2024

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

  • ✔️ development/7.70

  • ✔️ development/8.6

  • ✔️ development/8.7

  • ✔️ development/8.8

The following branches have NOT changed:

  • development/7.10
  • development/7.4

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

Goodbye tmacro.

@bert-e bert-e merged commit 1a21c4f into development/7.70 Jan 10, 2024
14 checks passed
@bert-e bert-e deleted the improvement/CLDSRV-475/add_overhead_fields_for_suspended_versioning branch January 10, 2024 19:00
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