Zenko icon indicating copy to clipboard operation
Zenko copied to clipboard

Published 20 hours ago • verified publisher icon scality

ZENKO-4656: bump zenko-ui deps to 1.6.17

Open ChengYanJin opened this issue 1 year ago • 7 comments

What does this PR do, and why do we need it? bump zenko-ui deps to 1.6.17

Which issue does this PR fix?

fixes #<ISSUE>

Special notes for your reviewers:

ChengYanJin avatar Oct 09 '23 09:10 ChengYanJin

Hello chengyanjin,

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 Oct 09 '23 09:10 bert-e

Incorrect fix version

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

  • None

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

  • 2.6.37

  • 2.7.33

  • 2.8.8

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

bert-e avatar Oct 09 '23 09:10 bert-e

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.

bert-e avatar Oct 09 '23 09:10 bert-e

/approve

ChengYanJin avatar Oct 09 '23 09:10 ChengYanJin

Conflict

A conflict has been raised during the creation of integration branch w/2.7/bugfix/ZENKO-4656-bump-zenko-ui-1.6.17 with contents from bugfix/ZENKO-4656-bump-zenko-ui-1.6.17 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-4656-bump-zenko-ui-1.6.17 origin/development/2.7
 $ git merge origin/bugfix/ZENKO-4656-bump-zenko-ui-1.6.17
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.7/bugfix/ZENKO-4656-bump-zenko-ui-1.6.17

The following options are set: approve

bert-e avatar Oct 09 '23 09:10 bert-e

Integration data created

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

The following branches will NOT be impacted:

  • development/2.5

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

bert-e avatar Oct 09 '23 09:10 bert-e

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: approve

bert-e avatar Oct 09 '23 09:10 bert-e