Skip to content

[main] (forwardport #18101) Doc: Refine geoip filter example for 8.19#18103

Closed
mergify[bot] wants to merge 1 commit into
mainfrom
mergify/bp/main/pr-18101
Closed

[main] (forwardport #18101) Doc: Refine geoip filter example for 8.19#18103
mergify[bot] wants to merge 1 commit into
mainfrom
mergify/bp/main/pr-18101

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Sep 3, 2025

Added sample output structure for geoip filter

Co-authored-by: kaisecheng <69120390+kaisecheng@users.noreply.github.com>
(cherry picked from commit 86ee4df)

# Conflicts:
#	docs/static/transforming-data.asciidoc
@mergify mergify Bot added backport conflicts Detected git conflicts labels Sep 3, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Sep 3, 2025

Cherry-pick of 86ee4df has failed:

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

You are currently cherry-picking commit 86ee4df1.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/static/transforming-data.asciidoc

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Sep 3, 2025

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

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

@github-actions github-actions Bot added the docs label Sep 3, 2025
Copy link
Copy Markdown
Contributor

@karenzone karenzone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DO NOT MERGE

ADOC PRs for 8.19 don't belong in MD source in main. The work for main is in this PR: #18092

@karenzone
Copy link
Copy Markdown
Contributor

karenzone commented Sep 3, 2025

ADOC files don't belong in `main. Closing without merge.

@karenzone karenzone closed this Sep 3, 2025
@karenzone karenzone deleted the mergify/bp/main/pr-18101 branch September 5, 2025 22:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts Detected git conflicts docs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant