scality
CLDSRV-544: Add timestamp on stderr [S3C 7.10 & 9.4 LTS]
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
[!IMPORTANT] Cherry-picks:
- https://github.com/scality/cloudserver/pull/5610
- https://github.com/scality/cloudserver/pull/5611
Hello bourgoismickael,
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 | :star: | |
/bypass_build_status |
Bypass the build and test status | :star: | |
/bypass_commit_size |
Bypass the check on the size of the changeset TBA |
:star: | |
/bypass_incompatible_branch |
Bypass the check on the source branch prefix | :star: | |
/bypass_jira_check |
Bypass the Jira issue check | :star: | |
/bypass_peer_approval |
Bypass the pull request peers' approval | :star: | |
/bypass_leader_approval |
Bypass the pull request leaders' approval | :star: | |
/approve |
Instruct Bert-E that the author has approved the pull request. | :writing_hand: | |
/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.
Incorrect fix version
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.
Incorrect fix version
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.
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.
Conflict
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
Conflict
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
Conflict
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
Conflict
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
Build failed
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