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

[8.4](backport #1951) Fix fleet.migration.total log key overlap #1961

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 6, 2022

This is an automatic backport of pull request #1951 done by Mergify.
Cherry-pick of 60ba1cf has failed:

On branch mergify/bp/8.4/pr-1951
Your branch is up to date with 'origin/8.4'.

You are currently cherry-picking commit 60ba1cf.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.next.asciidoc
	both modified:   internal/pkg/dl/migration.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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.com

Co-authored-by: Anderson Queiroz <[email protected]>
(cherry picked from commit 60ba1cf)

# Conflicts:
#	CHANGELOG.next.asciidoc
#	internal/pkg/dl/migration.go
@mergify mergify bot requested a review from a team as a code owner October 6, 2022 17:32
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 6, 2022
@mergify mergify bot requested review from AndersonQ and michel-laterman October 6, 2022 17:32
@elasticmachine
Copy link
Contributor

💔 Build Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-10-06T17:32:19.607+0000

  • Duration: 3 min 1 sec

Steps errors 1

Expand to view the steps failures

local
  • Took 0 min 15 sec . View more details here
  • Description: make local

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@mergify
Copy link
Contributor Author

mergify bot commented Oct 10, 2022

This pull request has not been merged yet. Could you please review and merge it @joshdover? 🙏

@joshdover joshdover closed this Oct 11, 2022
@mergify mergify bot deleted the mergify/bp/8.4/pr-1951 branch October 11, 2022 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants