Skip to content

Conversation

@lht
Copy link
Contributor

@lht lht commented Jul 4, 2022

Related to fluent/fluent-bit#5612

Signed-off-by: Haitao Li [email protected]

@lht lht force-pushed the conf-file-include-glob-order branch from 3a8cee7 to 344cb9a Compare July 4, 2022 11:14
@lht lht force-pushed the conf-file-include-glob-order branch from 344cb9a to 46a317b Compare July 4, 2022 11:16
@lecaros lecaros added the conflict Waiting on conflict to be resolved by contributor label Aug 18, 2022
@lecaros lecaros added the waiting-for-user Waiting for user/contributors feedback or requested changes label Feb 22, 2024
@lecaros
Copy link
Contributor

lecaros commented Feb 22, 2024

Hello @lht
is this PR still relevant?

@lecaros lecaros requested review from a team as code owners March 25, 2025 14:34
@eschabell eschabell self-assigned this Oct 21, 2025
@eschabell eschabell added waiting-on-review Waiting on a review from mainteners and removed waiting-on-code-merge labels Oct 21, 2025
@eschabell
Copy link
Collaborator

@patrick-stephens the submitter needs to resolve the conflicts, but wanted to ask if this is ready from your comments in this PR: fluent/fluent-bit#5612 (comment)

@eschabell
Copy link
Collaborator

@lht can you please resolve the conflicts here so I can merge for you?

@esmerel
Copy link
Contributor

esmerel commented Oct 21, 2025

The conflicts were due to formatting changes for style, I went ahead and fixed the conflicts in the interest of keeping things moving.

@patrick-stephens patrick-stephens merged commit cdfa2e8 into fluent:master Oct 21, 2025
7 checks passed
@eschabell
Copy link
Collaborator

@patrick-stephens the code PR fluent/fluent-bit#5612 related to this docs PR is not merged yet, so not sure this is good idea to merge and close?

@eschabell eschabell added waiting-on-code-merge and removed waiting-for-user Waiting for user/contributors feedback or requested changes conflict Waiting on conflict to be resolved by contributor waiting-on-review Waiting on a review from mainteners labels Oct 21, 2025
@patrick-stephens
Copy link
Contributor

The change here is to document current behaviour, there's no code change required

TomlinfreeGit pushed a commit to TomlinfreeGit/fluent-bit-docs that referenced this pull request Oct 28, 2025
…ters (fluent#837)

Related to fluent/fluent-bit#5612

Signed-off-by: Haitao Li <[email protected]>
Signed-off-by: Lynette  Miles <[email protected]>
Co-authored-by: Lynette  Miles <[email protected]>
Signed-off-by: Tom <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants