Bump vault with signatureAge of 0 fix - #2493
Conversation
Hello benzekrimaha,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
Request integration branchesWaiting for integration branch creation to be requested by the user. To request integration branches, please comment on this pull request with the following command: Alternatively, the |
|
/create_integration_branches |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: git fetch
git checkout -B w/2.13/improvement/ZENKO-5348-bump-vault origin/development/2.13
git merge origin/improvement/ZENKO-5348-bump-vault
# <intense conflict resolution>
git commit
git push -u origin w/2.13/improvement/ZENKO-5348-bump-vaultThe following options are set: create_integration_branches |
|
/create_integration_branches |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_integration_branches |
|
/create_pull_requests |
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
Follow integration pull requests if you would like to be notified of The following options are set: create_pull_requests, create_integration_branches |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_pull_requests, create_integration_branches |
ConflictA conflict has been raised during the update of Please resolve the conflict on the integration branch ( Here are the steps to resolve this conflict: git fetch
git checkout w/2.13/improvement/ZENKO-5348-bump-vault
git pull # or "git reset --hard origin/w/2.13/improvement/ZENKO-5348-bump-vault"
git merge origin/development/2.13
# <intense conflict resolution>
git commit
git merge origin/improvement/ZENKO-5348-bump-vault
# <intense conflict resolution>
git commit
git push -u origin w/2.13/improvement/ZENKO-5348-bump-vaultThe following options are set: create_pull_requests, create_integration_branches |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_pull_requests, create_integration_branches |
ad7e2c5 to
282b373
Compare
|
ping |
Status
The following options are set: create_pull_requests, create_integration_branches |
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
Follow integration pull requests if you would like to be notified of The following options are set: create_pull_requests, create_integration_branches |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_pull_requests, create_integration_branches |
ConflictA conflict has been raised during the update of Please resolve the conflict on the integration branch ( Here are the steps to resolve this conflict: git fetch
git checkout w/2.14/improvement/ZENKO-5348-bump-vault
git pull # or "git reset --hard origin/w/2.14/improvement/ZENKO-5348-bump-vault"
git merge origin/development/2.14
# <intense conflict resolution>
git commit
git merge origin/w/2.13/improvement/ZENKO-5348-bump-vault
# <intense conflict resolution>
git commit
git push -u origin w/2.14/improvement/ZENKO-5348-bump-vaultThe following options are set: create_pull_requests, create_integration_branches |
28547a5 to
2da44a4
Compare
History mismatchMerge commit #938ac81f28d8a1e01444db42c618e6ceedac442d on the integration branch It is likely due to a rebase of the branch Please use the The following options are set: create_pull_requests, create_integration_branches |
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
Follow integration pull requests if you would like to be notified of The following options are set: create_pull_requests, create_integration_branches |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_pull_requests, create_integration_branches |
|
/reset |
Lossy reset warningThere seems to be manual commits on integration branches (e.g. conflict You can use the The following options are set: approve, create_pull_requests, create_integration_branches |
|
/force_reset |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_pull_requests, create_integration_branches |
|
/create_integration_branches |
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
Follow integration pull requests if you would like to be notified of The following options are set: create_pull_requests, create_integration_branches |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_pull_requests, create_integration_branches |
|
/approve |
Build failedThe build for commit did not succeed in branch w/2.14/improvement/ZENKO-5348-bump-vault The following options are set: approve, create_pull_requests, create_integration_branches |
Queue build failedThe corresponding build for the queue failed:
Remove the pull request from the queue
|
|
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue ZENKO-5348. Goodbye benzekrimaha. |
Picks up the vault fix accepting falsy constant params in request context validation: a signatureAge of 0 was dropped from the request context, failing policy evaluation.
Issue: ZENKO-5348