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.

Sign up for GitHub

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

Jump to bottom

[8.9](backport #36034) x-pack/filebeat/input/awss3: fix priority of region name configurations #36096

Merged
merged 2 commits into from
Jul 18, 2023
Merged

[8.9](backport #36034) x-pack/filebeat/input/awss3: fix priority of region name configurations #36096

merged 2 commits into from
Jul 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 18, 2023 •
edited by zube bot
Loading

This is an automatic backport of pull request #36034 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.com

@efd6 @mergify
x-pack/filebeat/input/awss3: fix priority of region name configuratio…
7ab15ba 
…ns (#36034)

The code currently prioritises the region_name configuration, even when
it is not provided, against the claims of the documentation. Make a
check whether it is empty before claiming a conflict and using it.

(cherry picked from commit 57d649d)
@mergify mergify bot requested a review from a team as a code owner July 18, 2023 08:14
@mergify mergify bot added the backport label Jul 18, 2023
@mergify mergify bot assigned efd6 Jul 18, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 18, 2023
@botelastic
Copy link

botelastic bot commented Jul 18, 2023

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 18, 2023 •
edited by jenkins-beats-ci bot
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 preview

Expand to view the summary

Build stats

  • Start Time: 2023-07-18T18:30:26.539+0000

  • Duration: 135 min 56 sec

Test stats 🧪

Test Results
Failed 0
Passed 6106
Skipped 362
Total 6468

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

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

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@efd6 efd6 merged commit dd50d49 into 8.9 Jul 18, 2023
8 checks passed
@efd6 efd6 deleted the mergify/bp/8.9/pr-36034 branch July 18, 2023 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@efd6 efd6

Labels
backport needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@elasticmachine @efd6 @bhapas