-
Notifications
You must be signed in to change notification settings - Fork 19
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
feature/BB 358/supportNewerNoncurrentVersion #2364
feature/BB 358/supportNewerNoncurrentVersion #2364
Conversation
alexanderchan-scality
commented
Feb 10, 2023
- BB-358: add support for NewerNonccurrentVersions
- BB-358: add tests for NewerNoncurrentVersion helpers
- bump aws-sdk to v2.1035.0
Hello alexanderchan-scality,My role is to assist you with the merge of this Status report is not available. |
c7a9d3b
to
325fbb4
Compare
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/8.3/feature/BB-358/supportNewerNoncurrentVersion origin/development/8.3
$ git merge origin/feature/BB-358/supportNewerNoncurrentVersion
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.3/feature/BB-358/supportNewerNoncurrentVersion |
325fbb4
to
6a265c7
Compare
/reset |
Reset completeI have successfully deleted this pull request's integration branches. |
* add helper Heap objects to keep track of the newer objects when processing verisons for expiration
6a265c7
to
bd99d4a
Compare
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/8.3/feature/BB-358/supportNewerNoncurrentVersion origin/development/8.3
$ git merge origin/feature/BB-358/supportNewerNoncurrentVersion
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.3/feature/BB-358/supportNewerNoncurrentVersion |
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/8.4/feature/BB-358/supportNewerNoncurrentVersion origin/development/8.4
$ git merge origin/w/8.3/feature/BB-358/supportNewerNoncurrentVersion
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.4/feature/BB-358/supportNewerNoncurrentVersion |
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/8.5/feature/BB-358/supportNewerNoncurrentVersion origin/development/8.5
$ git merge origin/w/8.4/feature/BB-358/supportNewerNoncurrentVersion
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.5/feature/BB-358/supportNewerNoncurrentVersion |
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/8.6/feature/BB-358/supportNewerNoncurrentVersion origin/development/8.6
$ git merge origin/w/8.5/feature/BB-358/supportNewerNoncurrentVersion
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.6/feature/BB-358/supportNewerNoncurrentVersion |
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 BB-358. Goodbye alexanderchan-scality. |