Skip to content

Remove master_timeout from ingest.get_ip_location_database #4804

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

Merged
merged 2 commits into from
Jul 7, 2025

Conversation

pquentin
Copy link
Member

@pquentin pquentin commented Jul 7, 2025

@pquentin pquentin requested review from swallez and Anaethelion July 7, 2025 13:44
@pquentin pquentin mentioned this pull request Jul 7, 2025
25 tasks
Copy link
Contributor

github-actions bot commented Jul 7, 2025

Following you can find the validation changes against the target branch for the APIs.

No changes detected.

You can validate these APIs yourself by using the make validate target.

@pquentin pquentin merged commit a03b4d3 into main Jul 7, 2025
8 checks passed
@pquentin pquentin deleted the rest-api-spec-get-ip-location branch July 7, 2025 14:15
Copy link
Contributor

github-actions bot commented Jul 7, 2025

The backport to 8.19 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-8.19 8.19
# Navigate to the new working tree
cd .worktrees/backport-8.19
# Create a new branch
git switch --create backport-4804-to-8.19
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a03b4d3101fe946a98079e3d004d4ff79ba24d5c
# Push it to GitHub
git push --set-upstream origin backport-4804-to-8.19
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.19

Then, create a pull request where the base branch is 8.19 and the compare/head branch is backport-4804-to-8.19.

Copy link
Contributor

github-actions bot commented Jul 7, 2025

The backport to 8.18 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-8.18 8.18
# Navigate to the new working tree
cd .worktrees/backport-8.18
# Create a new branch
git switch --create backport-4804-to-8.18
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a03b4d3101fe946a98079e3d004d4ff79ba24d5c
# Push it to GitHub
git push --set-upstream origin backport-4804-to-8.18
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.18

Then, create a pull request where the base branch is 8.18 and the compare/head branch is backport-4804-to-8.18.

github-actions bot pushed a commit that referenced this pull request Jul 7, 2025
github-actions bot pushed a commit that referenced this pull request Jul 7, 2025
pquentin added a commit that referenced this pull request Jul 7, 2025
(cherry picked from commit a03b4d3)

# Conflicts:
#	output/schema/validation-errors.json
pquentin added a commit that referenced this pull request Jul 7, 2025
(cherry picked from commit a03b4d3)

# Conflicts:
#	output/schema/validation-errors.json
@pquentin
Copy link
Member Author

pquentin commented Jul 7, 2025

💚 All backports created successfully

Status Branch Result
8.19
8.18

Questions ?

Please refer to the Backport tool documentation

pquentin added a commit that referenced this pull request Jul 7, 2025
…4816)

(cherry picked from commit a03b4d3)

# Conflicts:
#	output/schema/validation-errors.json
pquentin added a commit that referenced this pull request Jul 7, 2025
pquentin added a commit that referenced this pull request Jul 7, 2025
pquentin added a commit that referenced this pull request Jul 7, 2025
…4817)

(cherry picked from commit a03b4d3)

# Conflicts:
#	output/schema/validation-errors.json
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.

2 participants