CLDSRV-49 upgrade to Node 16

[nicolas2bert]

[bert-e]

Hello nicolas2bert,

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]

Incorrect fix version

The Fix Version/s in issue CLDSRV-49 contains:

• 7.10.2

• 7.4.11

• 8.2.20

• 8.3.10

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

• 8.3.10

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

[bert-e]

Conflict

A conflict has been raised during the creation of integration branch w/7.10/feature/CLDSRV-49/UpgradeToNode16 with contents from feature/CLDSRV-49/UpgradeToNode16 and development/7.10.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/7.10/feature/CLDSRV-49/UpgradeToNode16 origin/development/7.10
 $ git merge origin/feature/CLDSRV-49/UpgradeToNode16
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.10/feature/CLDSRV-49/UpgradeToNode16

[nicolas2bert]

ping

[bert-e]

Conflict

A conflict has been raised during the creation of integration branch w/8.2/feature/CLDSRV-49/UpgradeToNode16 with contents from w/7.10/feature/CLDSRV-49/UpgradeToNode16 and development/8.2.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.2/feature/CLDSRV-49/UpgradeToNode16 origin/development/8.2
 $ git merge origin/w/7.10/feature/CLDSRV-49/UpgradeToNode16
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.2/feature/CLDSRV-49/UpgradeToNode16

[bert-e]

Conflict

A conflict has been raised during the creation of integration branch w/8.3/feature/CLDSRV-49/UpgradeToNode16 with contents from w/8.2/feature/CLDSRV-49/UpgradeToNode16 and development/8.3.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.3/feature/CLDSRV-49/UpgradeToNode16 origin/development/8.3
 $ git merge origin/w/8.2/feature/CLDSRV-49/UpgradeToNode16
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.3/feature/CLDSRV-49/UpgradeToNode16

[bert-e]

Integration data created

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

• this pull request will merge feature/CLDSRV-49/UpgradeToNode16 into development/7.4
• w/7.10/feature/CLDSRV-49/UpgradeToNode16 will be merged into development/7.10 (pull request #4216)
• w/8.2/feature/CLDSRV-49/UpgradeToNode16 will be merged into development/8.2 (pull request #4217)
• w/8.3/feature/CLDSRV-49/UpgradeToNode16 will be merged into development/8.3 (pull request #4218)

The following branches will NOT be impacted:

• development/6.4

Follow integration pull requests if you would like to be notified of build statuses by email.

[bert-e]

Waiting for approval

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

• the author

• 2 peers

[bert-e]

Incorrect fix version

The Fix Version/s in issue CLDSRV-49 contains:

• 7.10.2

• 7.4.11

• 8.2.20

• 8.3.10

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

• 7.10.3

• 7.4.11

• 8.2.20

• 8.3.10

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

[bert-e]

Waiting for approval

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

• the author

• 2 peers

[bert-e]

Conflict

There is a conflict between your branch feature/CLDSRV-49/UpgradeToNode16 and the destination branch development/7.4.

Please resolve the conflict on the feature branch (feature/CLDSRV-49/UpgradeToNode16).

git fetch && \
git checkout origin/feature/CLDSRV-49/UpgradeToNode16 && \
git merge origin/development/7.4

Resolve merge conflicts and commit

git push origin HEAD:feature/CLDSRV-49/UpgradeToNode16

[nicolas2bert]

@bert-e wait