Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

fix: check if kibana version is a commit (backport #1047)#1071

Merged
mdelapenya merged 2 commits into7.xfrom
mergify/bp/7.x/pr-1047
Apr 22, 2021
Merged

fix: check if kibana version is a commit (backport #1047)#1071
mdelapenya merged 2 commits into7.xfrom
mergify/bp/7.x/pr-1047

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Apr 22, 2021

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

Cherry-pick of 05ab18f has failed:

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

You are currently cherry-picking commit 05ab18f2.
  (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:   internal/utils/utils.go
	modified:   internal/utils/utils_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   e2e/_suites/fleet/ingest_manager_test.go

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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/

@mdelapenya
fix: check if kibana version is a commit (#1047)
54c9e25 
(cherry picked from commit 05ab18f)

# Conflicts:
#	e2e/_suites/fleet/ingest_manager_test.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Apr 22, 2021
mdelapenya
mdelapenya reviewed Apr 22, 2021
View reviewed changes
@mdelapenya mdelapenya removed the conflicts There is a conflict in the backported pull request label Apr 22, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Apr 22, 2021 •
edited
Loading

💚 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

Expand to view the summary

Build stats

  • Build Cause: Pull request #1071 updated

  • Start Time: 2021-04-22T06:33:26.169+0000

  • Duration: 4 min 18 sec

  • Commit: aefa43e

Test stats 🧪

Test Results
Failed 0
Passed 40
Skipped 0
Total 40

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 40
Skipped 0
Total 40

@mdelapenya mdelapenya merged commit 4cd5b44 into 7.x Apr 22, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-1047 branch April 22, 2021 07:51
@mdelapenya mdelapenya mentioned this pull request Oct 26, 2021
Merged
8 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@mdelapenya mdelapenya mdelapenya left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@mdelapenya mdelapenya

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @mdelapenya