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

[7.x] Add data_streams.wait_for_integration (backport #5928) #5929

Merged
merged 4 commits into from
Aug 12, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 11, 2021

This is an automatic backport of pull request #5928 done by Mergify.
Cherry-pick of 114d7d6 has failed:

On branch mergify/bp/7.x/pr-5928
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 114d7d62.
  (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)

Changes to be committed:
	modified:   beater/config/config_test.go
	modified:   beater/config/data_streams.go
	modified:   beater/server_test.go
	modified:   docs/configuration-process.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   beater/beater.go
	deleted by us:   changelogs/head.asciidoc

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.io/

(cherry picked from commit 114d7d6)

# Conflicts:
#	beater/beater.go
#	changelogs/head.asciidoc
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Aug 11, 2021
@mergify mergify bot assigned axw Aug 11, 2021
@apmmachine
Copy link
Contributor

apmmachine commented Aug 11, 2021

💚 Build Succeeded

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: 2021-08-12T02:57:27.182+0000

  • Duration: 45 min 14 sec

  • Commit: 75893e1

Test stats 🧪

Test Results
Failed 0
Passed 4508
Skipped 15
Total 4523

Trends 🧪

Image of Build Times

Image of Tests

@mergify
Copy link
Contributor Author

mergify bot commented Aug 12, 2021

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.x/pr-5928 upstream/mergify/bp/7.x/pr-5928
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-5928

@axw
Copy link
Member

axw commented Aug 12, 2021

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Aug 12, 2021

Command rebase: failure

Base branch update has failed
Git reported the following error:

Rebasing (1/1)

error: could not apply 9110da7... Add data_streams.wait_for_integration (#5928)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 9110da7... Add data_streams.wait_for_integration (#5928)
Auto-merging beater/beater.go
CONFLICT (content): Merge conflict in beater/beater.go


err-code: 43FE4

@axw axw removed the conflicts There is a conflict in the backported pull request label Aug 12, 2021
@axw axw merged commit a10e68f into 7.x Aug 12, 2021
@axw axw deleted the mergify/bp/7.x/pr-5928 branch August 12, 2021 08:41
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.

2 participants