CLDSRV-674: bump package.json

[leif-scality]

bump package.json

[bert-e]

Hello leif-scality,

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]

Branches have diverged

This pull request's source branch bugfix/CLDSRV-674 has diverged from
development/9.0 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

• Merge origin/development/9.0 into bugfix/CLDSRV-674
• Rebase bugfix/CLDSRV-674 onto origin/development/9.0

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

[leif-scality]

ping

[bert-e]

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

[anurag4DSB]

Do you have to bump in integration branches as well?

[leif-scality]

Do you have to bump in integration branches as well?

I think yes

[leif-scality]

/create_integration_branches

[bert-e]

Conflict

A conflict has been raised during the creation of
integration branch w/8.8/bugfix/CLDSRV-674 with contents from bugfix/CLDSRV-674
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-674 origin/development/8.8
 $ git merge origin/bugfix/CLDSRV-674
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.8/bugfix/CLDSRV-674

The following options are set: create_integration_branches

[leif-scality]

ping

[bert-e]

Integration data created

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

• this pull request will merge bugfix/CLDSRV-674 into
  development/7.70
• w/8.8/bugfix/CLDSRV-674 will be merged into development/8.8
• w/9.0/bugfix/CLDSRV-674 will be merged into development/9.0
• w/9.1/bugfix/CLDSRV-674 will be merged into development/9.1

The following branches will NOT be impacted:

• development/7.10
• 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

[leif-scality]

ping

[leif-scality]

@bert-e create_pull_requests

[bert-e]

Conflict

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

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

Here are the steps to resolve this conflict:

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

The following options are set: create_pull_requests, create_integration_branches

[leif-scality]

/approve

[bert-e]

Conflict

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

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

Here are the steps to resolve this conflict:

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

The following options are set: approve, create_pull_requests, create_integration_branches

[leif-scality]

ping

[bert-e]

History mismatch

Merge commit #b7f30c66b006597b55fc52b64a38e8ce9d5d8258 on the integration branch
w/9.0/bugfix/CLDSRV-674 is merging a branch which is neither the current
branch bugfix/CLDSRV-674 nor the development branch
development/9.0.

It is likely due to a rebase of the branch bugfix/CLDSRV-674 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve, create_pull_requests, create_integration_branches

[leif-scality]

ping

[bert-e]

Conflict

A conflict has been raised during the creation of
integration branch w/9.0/bugfix/CLDSRV-674 with contents from w/8.8/bugfix/CLDSRV-674
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-674 origin/development/9.0
 $ git merge origin/w/8.8/bugfix/CLDSRV-674
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/9.0/bugfix/CLDSRV-674

The following options are set: approve, create_pull_requests, create_integration_branches

[leif-scality]

ping

[bert-e]

Integration data created

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

• this pull request will merge bugfix/CLDSRV-674 into
  development/7.70
• w/8.8/bugfix/CLDSRV-674 will be merged into development/8.8 (pull request INTEGRATION [PR#5887 > development/8.8] CLDSRV-674: bump package.json #5888)
• w/9.0/bugfix/CLDSRV-674 will be merged into development/9.0 (pull request INTEGRATION [PR#5887 > development/9.0] CLDSRV-674: bump package.json #5889)
• w/9.1/bugfix/CLDSRV-674 will be merged into development/9.1 (pull request INTEGRATION [PR#5887 > development/9.1] CLDSRV-674: bump package.json #5890)

The following branches will NOT be impacted:

• development/7.10
• development/7.4

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

The following options are set: approve, create_pull_requests, create_integration_branches

[leif-scality]

/approve

[bert-e]

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

• ✔️ development/7.70

• ✔️ development/8.8

• ✔️ development/9.0

• ✔️ development/9.1

The following branches have NOT changed:

• development/7.10
• development/7.4

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

Goodbye leif-scality.

The following options are set: approve, create_pull_requests, create_integration_branches