-
Notifications
You must be signed in to change notification settings - Fork 3
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
bugfix: VLTCLT-21 allow multiple request contexts to check policies #413
bugfix: VLTCLT-21 allow multiple request contexts to check policies #413
Conversation
Hello miniscruff,My role is to assist you with the merge of this Status report is not available. |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
|
Hello @miniscruff , thanks for pinging me here! I just wanted to confirm if these changes will be applied with the required changes in Vault. Please refer to what changed in Vault2: https://github.com/scality/vault2/pull/76/files#diff-6928997f0457bd503f20041d30db8bdf726db88d707ef97a84d4aecacc35bb1bR92 / https://github.com/scality/vault2/pull/76/files#diff-dc43d538913b31432ccdbaeecb51b7b910e02b29278be6b5429e9406e6021141R480 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😄
Might be needed to also bump the project version if we want to use it in Vault
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/8.3/bugfix/VLTCLT-21/allow-multiple-request-contexts-for-check-policies
$ git pull # or "git reset --hard origin/w/8.3/bugfix/VLTCLT-21/allow-multiple-request-contexts-for-check-policies"
$ git merge origin/development/8.3
$ # <intense conflict resolution>
$ git commit
$ git merge origin/w/8.2/bugfix/VLTCLT-21/allow-multiple-request-contexts-for-check-policies
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.3/bugfix/VLTCLT-21/allow-multiple-request-contexts-for-check-policies |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
|
/approve |
In the queueThe changeset has received all authorizations and has been added to the The changeset will be merged in:
The following branches will NOT be impacted:
There is no action required on your side. You will be notified here once IMPORTANT Please do not attempt to modify this pull request.
If you need this pull request to be removed from the queue, please contact a The following options are set: approve |
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue VLTCLT-21. Goodbye miniscruff. |
@williamlardier I grabbed part of #411 so I can use it in S3C-6002, that is basically all.