Closed BourgoisMickael closed 1 month ago
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.
The Fix Version/s
in issue CLDSRV-544 contains:
7.10.47
7.70.21-8
7.70.45.2
7.70.47
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.10.49
7.70.50
8.6.27
8.7.48
8.8.27
Please check the Fix Version/s
of CLDSRV-544, or the target
branch of this pull request.
The Fix Version/s
in issue CLDSRV-544 contains:
7.10.49
7.70.21-8
7.70.45.2
7.70.50
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.10.49
7.70.50
8.6.27
8.7.48
8.8.27
Please check the Fix Version/s
of CLDSRV-544, or the target
branch of this pull request.
ping
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.
/create_integration_branches
A conflict has been raised during the creation of
integration branch w/7.70/improvement/CLDSRV-544-stderr
with contents from improvement/CLDSRV-544-stderr
and development/7.70
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/7.70/improvement/CLDSRV-544-stderr origin/development/7.70
$ git merge origin/improvement/CLDSRV-544-stderr
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.70/improvement/CLDSRV-544-stderr
The following options are set: create_integration_branches
ping
A conflict has been raised during the creation of
integration branch w/8.6/improvement/CLDSRV-544-stderr
with contents from w/7.70/improvement/CLDSRV-544-stderr
and development/8.6
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/8.6/improvement/CLDSRV-544-stderr origin/development/8.6
$ git merge origin/w/7.70/improvement/CLDSRV-544-stderr
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.6/improvement/CLDSRV-544-stderr
The following options are set: create_integration_branches
/approve
A conflict has been raised during the creation of
integration branch w/8.7/improvement/CLDSRV-544-stderr
with contents from w/8.6/improvement/CLDSRV-544-stderr
and development/8.7
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/8.7/improvement/CLDSRV-544-stderr origin/development/8.7
$ git merge origin/w/8.6/improvement/CLDSRV-544-stderr
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.7/improvement/CLDSRV-544-stderr
The following options are set: approve, create_integration_branches
ping
A conflict has been raised during the creation of
integration branch w/8.8/improvement/CLDSRV-544-stderr
with contents from w/8.7/improvement/CLDSRV-544-stderr
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/improvement/CLDSRV-544-stderr origin/development/8.8
$ git merge origin/w/8.7/improvement/CLDSRV-544-stderr
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.8/improvement/CLDSRV-544-stderr
The following options are set: approve, create_integration_branches
The build for commit did not succeed in branch w/8.8/improvement/CLDSRV-544-stderr.
The following options are set: approve, create_integration_branches
I have successfully merged the changeset of this pull request into targetted development branches:
:heavy_check_mark: development/7.10
:heavy_check_mark: development/7.70
:heavy_check_mark: development/8.6
:heavy_check_mark: development/8.7
:heavy_check_mark: development/8.8
The following branches have NOT changed:
development/7.4
Please check the status of the associated issue CLDSRV-544.
Goodbye bourgoismickael.
The following options are set: approve, create_integration_branches
The previous version would not exit the master of the cluster Now it exits as it should do
Also the error in cluster workers are printed in stdout as json and on stderr