ZENKO-4731: bump vault version #2005

benzekrimaha · 2024-01-25T10:01:26Z

Generated by copilot

This pull request includes a minor update to the solution/deps.yaml file in the vault: section. The tag value has been updated from 8.7.9 to 8.7.11, indicating an upgrade to a newer version of the software.

By author

This PR is bumping vault version adressing both : https://scality.atlassian.net/browse/VAULT-538 and https://scality.atlassian.net/browse/VAULT-537

bert-e · 2024-01-25T10:01:29Z

Hello benzekrimaha,

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 · 2024-01-25T10:01:35Z

Incorrect fix version

The Fix Version/s in issue ZENKO-4731 contains:

2.6.45
2.7.41
2.8.21

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

2.6.45
2.7.41
2.8.21
2.9.0

Please check the Fix Version/s of ZENKO-4731, or the target
branch of this pull request.

benzekrimaha · 2024-01-25T10:03:36Z

ping

bert-e · 2024-01-25T10:03:47Z

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.

benzekrimaha · 2024-01-25T10:03:54Z

/create_integration_branches

bert-e · 2024-01-25T10:04:07Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.8/bugfix/ZENKO-4731-account-content-info-disclosure with contents from w/2.7/bugfix/ZENKO-4731-account-content-info-disclosure
and development/2.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.8/bugfix/ZENKO-4731-account-content-info-disclosure origin/development/2.8
 $ git merge origin/w/2.7/bugfix/ZENKO-4731-account-content-info-disclosure
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.8/bugfix/ZENKO-4731-account-content-info-disclosure

The following options are set: create_integration_branches

benzekrimaha · 2024-01-25T10:06:05Z

ping

bert-e · 2024-01-25T10:07:36Z

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 · 2024-01-25T10:15:05Z

Conflict

A conflict has been raised during the update of
integration branch w/2.7/bugfix/ZENKO-4731-account-content-info-disclosure with contents from bugfix/ZENKO-4731-account-content-info-disclosure
and development/2.7.

Please resolve the conflict on the integration branch (w/2.7/bugfix/ZENKO-4731-account-content-info-disclosure).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/2.7/bugfix/ZENKO-4731-account-content-info-disclosure
 $ git pull  # or "git reset --hard origin/w/2.7/bugfix/ZENKO-4731-account-content-info-disclosure"
 $ git merge origin/development/2.7
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/bugfix/ZENKO-4731-account-content-info-disclosure
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.7/bugfix/ZENKO-4731-account-content-info-disclosure

The following options are set: create_integration_branches

benzekrimaha · 2024-01-25T10:15:16Z

/reset

bert-e · 2024-01-25T10:15:25Z

Reset complete

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

The following options are set: create_integration_branches

bert-e · 2024-01-25T10:15:35Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.7/bugfix/ZENKO-4731-account-content-info-disclosure with contents from bugfix/ZENKO-4731-account-content-info-disclosure
and development/2.7.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.7/bugfix/ZENKO-4731-account-content-info-disclosure origin/development/2.7
 $ git merge origin/bugfix/ZENKO-4731-account-content-info-disclosure
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.7/bugfix/ZENKO-4731-account-content-info-disclosure

The following options are set: create_integration_branches

benzekrimaha · 2024-01-25T10:16:55Z

ping

bert-e · 2024-01-25T10:20:16Z

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

benzekrimaha · 2024-01-25T10:20:38Z

/create_pull_requests

bert-e · 2024-01-25T10:20:53Z

Integration data created

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

this pull request will merge bugfix/ZENKO-4731-account-content-info-disclosure into
development/2.6
w/2.7/bugfix/ZENKO-4731-account-content-info-disclosure will be merged into development/2.7 (pull request INTEGRATION [PR#2005 > development/2.7] ZENKO-4731: bump vault version #2006)
w/2.8/bugfix/ZENKO-4731-account-content-info-disclosure will be merged into development/2.8 (pull request INTEGRATION [PR#2005 > development/2.8] ZENKO-4731: bump vault version #2007)
w/2.9/bugfix/ZENKO-4731-account-content-info-disclosure will be merged into development/2.9 (pull request INTEGRATION [PR#2005 > development/2.9] ZENKO-4731: bump vault version #2008)

The following branches will NOT be impacted:

development/2.5

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

The following options are set: create_pull_requests, create_integration_branches

bert-e · 2024-01-25T10:20:56Z

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_pull_requests, create_integration_branches

benzekrimaha · 2024-01-26T09:39:29Z

/approve

bert-e · 2024-01-26T09:39:45Z

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/2.6
✔️ development/2.7
✔️ development/2.8
✔️ development/2.9

The following branches will NOT be impacted:

development/2.5

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_pull_requests, create_integration_branches

bert-e · 2024-01-26T09:39:58Z

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

✔️ development/2.6
✔️ development/2.7
✔️ development/2.8
✔️ development/2.9

The following branches have NOT changed:

development/2.5

Please check the status of the associated issue ZENKO-4731.

Goodbye benzekrimaha.

ZENKO-4731: bump vault version

9981216

scality deleted a comment from bert-e Jan 25, 2024

ZENKO-4731: bump zenko version

f537351

scality deleted a comment from bert-e Jan 25, 2024

This was referenced Jan 25, 2024

INTEGRATION [PR#2005 > development/2.7] ZENKO-4731: bump vault version #2006

Merged

INTEGRATION [PR#2005 > development/2.8] ZENKO-4731: bump vault version #2007

Merged

INTEGRATION [PR#2005 > development/2.9] ZENKO-4731: bump vault version #2008

Merged

francoisferrand approved these changes Jan 25, 2024

View reviewed changes

fredmnl approved these changes Jan 25, 2024

View reviewed changes

anurag4DSB approved these changes Jan 25, 2024

View reviewed changes

bert-e merged commit f537351 into development/2.6 Jan 26, 2024
19 checks passed

bert-e deleted the bugfix/ZENKO-4731-account-content-info-disclosure branch January 26, 2024 09:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ZENKO-4731: bump vault version #2005

ZENKO-4731: bump vault version #2005

benzekrimaha commented Jan 25, 2024

bert-e commented Jan 25, 2024

bert-e commented Jan 25, 2024

benzekrimaha commented Jan 25, 2024

bert-e commented Jan 25, 2024

benzekrimaha commented Jan 25, 2024

bert-e commented Jan 25, 2024

benzekrimaha commented Jan 25, 2024

bert-e commented Jan 25, 2024

bert-e commented Jan 25, 2024

benzekrimaha commented Jan 25, 2024

bert-e commented Jan 25, 2024

bert-e commented Jan 25, 2024

benzekrimaha commented Jan 25, 2024

bert-e commented Jan 25, 2024

benzekrimaha commented Jan 25, 2024

bert-e commented Jan 25, 2024

bert-e commented Jan 25, 2024

benzekrimaha commented Jan 26, 2024

bert-e commented Jan 26, 2024

bert-e commented Jan 26, 2024

ZENKO-4731: bump vault version #2005

ZENKO-4731: bump vault version #2005

Conversation

benzekrimaha commented Jan 25, 2024

Generated by copilot

By author

bert-e commented Jan 25, 2024

Hello benzekrimaha,

bert-e commented Jan 25, 2024

Incorrect fix version

benzekrimaha commented Jan 25, 2024

bert-e commented Jan 25, 2024

Request integration branches

benzekrimaha commented Jan 25, 2024

bert-e commented Jan 25, 2024

Conflict

benzekrimaha commented Jan 25, 2024

bert-e commented Jan 25, 2024

Waiting for approval

bert-e commented Jan 25, 2024

Conflict

benzekrimaha commented Jan 25, 2024

bert-e commented Jan 25, 2024

Reset complete

bert-e commented Jan 25, 2024

Conflict

benzekrimaha commented Jan 25, 2024

bert-e commented Jan 25, 2024

Waiting for approval

benzekrimaha commented Jan 25, 2024

bert-e commented Jan 25, 2024

Integration data created

bert-e commented Jan 25, 2024

Waiting for approval

benzekrimaha commented Jan 26, 2024

bert-e commented Jan 26, 2024

In the queue

bert-e commented Jan 26, 2024