Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ceph: only merge stderr on error (backport #8995) #8998

Merged
merged 1 commit into from Oct 19, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 18, 2021

This is an automatic backport of pull request #8995 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@leseb
Copy link
Member

leseb commented Oct 19, 2021

@Mergifyio rebase

Previously we were merging the stderr even if it was empty, leading to
unmarshall errors.
The error simulation was done here
https://play.golang.org/p/Sk2yw9GUWNu.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 0e41e36)
@mergify
Copy link
Author

mergify bot commented Oct 19, 2021

rebase

✅ Branch has been successfully rebased

@leseb leseb force-pushed the mergify/bp/release-1.7/pr-8995 branch from 8aeeb40 to d0e9b56 Compare October 19, 2021 07:12
@mergify mergify bot merged commit ca43f86 into release-1.7 Oct 19, 2021
@mergify mergify bot deleted the mergify/bp/release-1.7/pr-8995 branch October 19, 2021 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant