Skip to content

Conversation

@russcam
Copy link
Contributor

@russcam russcam commented Apr 16, 2020

Relates: elastic/elasticsearch#53466, elastic/elasticsearch#52564
elastic/elasticsearch#53466, elastic/elasticsearch#52133

This commit updates the Skip versions on circle and multipoint
geoshape queries, to allow them to run for versions 7.7.0+.

Update documentation to indicate that 7.7.0+ is required when
geo shapes are indexed using BKD trees

Relates: elastic/elasticsearch#53466, elastic/elasticsearch#52564
elastic/elasticsearch#53466, elastic/elasticsearch#52133

This commit updates the Skip versions on circle and multipoint
geoshape queries, to allow them to run for versions 7.7.0+.

Update documentation to indicate that 7.7.0+ is required when
geo shapes are indexed using BKD trees
@russcam russcam merged commit aff2c93 into master Apr 17, 2020
@russcam russcam deleted the feature/circle-multipoint-support branch April 17, 2020 05:27
@github-actions
Copy link
Contributor

The backport to 7.7 failed:

The process 'git' failed with exit code 128

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-7.7 7.7
# Navigate to the new working tree
cd .worktrees/backport-7.7
# Create a new branch
git switch --create backport-4601-to-7.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick aff2c935c7de1ddfcb7cd7863ed41dfa395d2ac3
# Push it to GitHub
git push --set-upstream origin backport-4601-to-7.7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.7

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

@github-actions
Copy link
Contributor

The backport to 7.x failed:

The process 'git' failed with exit code 128

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-7.x 7.x
# Navigate to the new working tree
cd .worktrees/backport-7.x
# Create a new branch
git switch --create backport-4601-to-7.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick aff2c935c7de1ddfcb7cd7863ed41dfa395d2ac3
# Push it to GitHub
git push --set-upstream origin backport-4601-to-7.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.x

Then, create a pull request where the base branch is 7.x and the compare/head branch is backport-4601-to-7.x.

russcam added a commit that referenced this pull request Apr 17, 2020
Integration tests and docs for circle and multipoint geoshape queries

(cherry picked from commit aff2c93)
russcam added a commit that referenced this pull request Apr 17, 2020
Integration tests and docs for circle and multipoint geoshape queries

(cherry picked from commit aff2c93)
@russcam
Copy link
Contributor Author

russcam commented Apr 17, 2020

manually backported to 7.7 and 7.x

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants