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.

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

Update bulk.asciidoc change 'date' property to 'time' to match index creation #2154

Merged
merged 1 commit into from
Mar 20, 2024

Conversation

SuperGingie
Copy link
Contributor

In the code example, the index is created with a property called 'time' but the dataset has a field called 'date.' Updating the 'date' field to match the 'time' property of the index.

Copy link
Member

@JoshMock JoshMock left a comment

Choose a reason for hiding this comment

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

good catch! thanks for the contribution.

@JoshMock
Copy link
Member

buildkite test this

@JoshMock JoshMock merged commit 7471710 into elastic:8.12 Mar 20, 2024
7 checks passed
Copy link
Contributor

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

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

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