CLDSRV-654 bump bucketclient

[jonathan-gramain]

No description provided.

[bert-e]

Hello jonathan-gramain,

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.

Available options

name	description	privileged	authored
/after_pull_request	Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval	Bypass the pull request author's approval	⭐
/bypass_build_status	Bypass the build and test status	⭐
/bypass_commit_size	Bypass the check on the size of the changeset TBA	⭐
/bypass_incompatible_branch	Bypass the check on the source branch prefix	⭐
/bypass_jira_check	Bypass the Jira issue check	⭐
/bypass_peer_approval	Bypass the pull request peers' approval	⭐
/bypass_leader_approval	Bypass the pull request leaders' approval	⭐
/approve	Instruct Bert-E that the author has approved the pull request.		✍️
/create_pull_requests	Allow the creation of integration pull requests.
/create_integration_branches	Allow the creation of integration branches.
/no_octopus	Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity	Change review acceptance criteria from one reviewer at least to all reviewers
/wait	Instruct Bert-E not to run until further notice.

Available commands

name	description	privileged
/help	Print Bert-E's manual in the pull request.
/status	Print Bert-E's current status in the pull request TBA
/clear	Remove all comments from Bert-E from the history TBA
/retry	Re-start a fresh build TBA
/build	Re-start a fresh build TBA
/force_reset	Delete integration branches & pull requests, and restart merge process from the beginning.
/reset	Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

[bert-e]

Incorrect fix version

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

• 7.10.56

• 7.70.69

• 8.8.49

• 9.0.12

• 9.1.0

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

• 7.10.56

• 7.70.69

• 8.8.49

• 9.0.13

• 9.1.0

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

[jonathan-gramain]

/create_integration_branches

[bert-e]

Conflict

A conflict has been raised during the creation of
integration branch w/8.8/bugfix/CLDSRV-654-bump-bucketclient with contents from w/7.70/bugfix/CLDSRV-654-bump-bucketclient
and development/8.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.8/bugfix/CLDSRV-654-bump-bucketclient origin/development/8.8
 $ git merge origin/w/7.70/bugfix/CLDSRV-654-bump-bucketclient
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.8/bugfix/CLDSRV-654-bump-bucketclient

The following options are set: create_integration_branches

[bert-e]

Conflict

A conflict has been raised during the creation of
integration branch w/9.0/bugfix/CLDSRV-654-bump-bucketclient with contents from w/8.8/bugfix/CLDSRV-654-bump-bucketclient
and development/9.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/9.0/bugfix/CLDSRV-654-bump-bucketclient origin/development/9.0
 $ git merge origin/w/8.8/bugfix/CLDSRV-654-bump-bucketclient
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/9.0/bugfix/CLDSRV-654-bump-bucketclient

The following options are set: create_integration_branches

[bert-e]

Integration data created

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

• this pull request will merge bugfix/CLDSRV-654-bump-bucketclient into
  development/7.10
• w/7.70/bugfix/CLDSRV-654-bump-bucketclient will be merged into development/7.70
• w/8.8/bugfix/CLDSRV-654-bump-bucketclient will be merged into development/8.8
• w/9.0/bugfix/CLDSRV-654-bump-bucketclient will be merged into development/9.0
• w/9.1/bugfix/CLDSRV-654-bump-bucketclient will be merged into development/9.1

The following branches will NOT be impacted:

• development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: create_integration_branches

[bert-e]

Waiting for approval

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

• the author

• 2 peers

The following options are set: create_integration_branches

[bert-e]

Conflict

A conflict has been raised during the update of
integration branch w/7.70/bugfix/CLDSRV-654-bump-bucketclient with contents from bugfix/CLDSRV-654-bump-bucketclient
and development/7.70.

Please resolve the conflict on the integration branch (w/7.70/bugfix/CLDSRV-654-bump-bucketclient).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/7.70/bugfix/CLDSRV-654-bump-bucketclient
 $ git pull  # or "git reset --hard origin/w/7.70/bugfix/CLDSRV-654-bump-bucketclient"
 $ git merge origin/development/7.70
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/bugfix/CLDSRV-654-bump-bucketclient
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/CLDSRV-654-bump-bucketclient

The following options are set: create_integration_branches

[bert-e]

Conflict

A conflict has been raised during the update of
integration branch w/8.8/bugfix/CLDSRV-654-bump-bucketclient with contents from w/7.70/bugfix/CLDSRV-654-bump-bucketclient
and development/8.8.

Please resolve the conflict on the integration branch (w/8.8/bugfix/CLDSRV-654-bump-bucketclient).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/8.8/bugfix/CLDSRV-654-bump-bucketclient
 $ git pull  # or "git reset --hard origin/w/8.8/bugfix/CLDSRV-654-bump-bucketclient"
 $ git merge origin/development/8.8
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/w/7.70/bugfix/CLDSRV-654-bump-bucketclient
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.8/bugfix/CLDSRV-654-bump-bucketclient

The following options are set: create_integration_branches

[bert-e]

Incorrect fix version

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

• 7.10.56

• 7.70.69

• 8.8.50

• 9.0.13

• 9.1.0

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

• 7.10.56

• 7.70.69

• 8.8.49

• 9.0.13

• 9.1.0

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

The following options are set: create_integration_branches

[jonathan-gramain]

ping

[bert-e]

Conflict

A conflict has been raised during the update of
integration branch w/9.0/bugfix/CLDSRV-654-bump-bucketclient with contents from w/8.8/bugfix/CLDSRV-654-bump-bucketclient
and development/9.0.

Please resolve the conflict on the integration branch (w/9.0/bugfix/CLDSRV-654-bump-bucketclient).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/9.0/bugfix/CLDSRV-654-bump-bucketclient
 $ git pull  # or "git reset --hard origin/w/9.0/bugfix/CLDSRV-654-bump-bucketclient"
 $ git merge origin/development/9.0
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/w/8.8/bugfix/CLDSRV-654-bump-bucketclient
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/9.0/bugfix/CLDSRV-654-bump-bucketclient

The following options are set: create_integration_branches

[bert-e]

Waiting for approval

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

• the author

• 2 peers

The following options are set: create_integration_branches

[jonathan-gramain]

/approve

[bert-e]

I have successfully merged the changeset of this pull request
into targetted development branches:

• ✔️ development/7.10

• ✔️ development/7.70

• ✔️ development/8.8

• ✔️ development/9.0

• ✔️ development/9.1

The following branches have NOT changed:

• development/7.4

Please check the status of the associated issue CLDSRV-654.

Goodbye jonathan-gramain.

The following options are set: approve, create_integration_branches