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

[Backport main] Update default queries; update quick config fields; misc updates #661

Merged
merged 1 commit into from
Mar 5, 2025

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport c729bec from #660.

* Change default to match query

Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>

* Only show embedding field in quick config if unknown

Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>

* add gear in header for newhomepage

Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>

---------

Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>
(cherry picked from commit c729bec)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@saimedhi saimedhi merged commit fb72704 into main Mar 5, 2025
13 checks passed
@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/dashboards-flow-framework/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-flow-framework/backport-2.x
# Create a new branch
git switch --create backport/backport-661-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fb72704a8d2208fda03369a32dcd509493430071
# Push it to GitHub
git push --set-upstream origin backport/backport-661-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-flow-framework/backport-2.x

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

@ohltyler ohltyler deleted the backport/backport-660-to-main branch March 5, 2025 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autocut bug Something isn't working enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants