CLDSRV-444: unit test with Id and arsenal version#5333
CLDSRV-444: unit test with Id and arsenal version#5333benzekrimaha wants to merge 5 commits intodevelopment/7.10from
Conversation
Hello benzekrimaha,My role is to assist you with the merge of this Status report is not available. |
Branches have divergedThis pull request's source branch To avoid any integration risks, please re-synchronize them using one of the
Note: If you choose to rebase, you may have to ask me to rebuild |
Incorrect fix versionThe
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
Please check the |
|
ping |
1 similar comment
|
ping |
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/7.70/bugfix/CLDSRV-444-id-on-resource-policy origin/development/7.70
$ git merge origin/bugfix/CLDSRV-444-id-on-resource-policy
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.70/bugfix/CLDSRV-444-id-on-resource-policy |
(cherry picked from commit 294f70d)
(cherry picked from commit 294f70d)
…scality/cloudserver into bugfix/CLDSRV-444-id-on-resource-policy
Description
Motivation and context
In this PR new unit tests were added to test the support of the Id definition and the arsenal version updated for that matter
Checklist
Add tests to cover the changes
New tests added