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 2.11] Switch heading types on integrations setup page #1137

Merged
merged 1 commit into from
Oct 17, 2023

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 4540326 from #1136.

(cherry picked from commit 4540326)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@codecov
Copy link

codecov bot commented Oct 17, 2023

Codecov Report

Merging #1137 (f433d2c) into 2.11 (f1aac6c) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             2.11    #1137   +/-   ##
=======================================
  Coverage   44.22%   44.22%           
=======================================
  Files         327      327           
  Lines       19477    19477           
  Branches     4643     4643           
=======================================
  Hits         8614     8614           
  Misses      10818    10818           
  Partials       45       45           
Flag Coverage Δ
dashboards-observability 44.22% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@derek-ho derek-ho merged commit 7196704 into 2.11 Oct 17, 2023
11 checks passed
@derek-ho derek-ho deleted the backport/backport-1136-to-2.11 branch October 17, 2023 19:51
mengweieric added a commit to mengweieric/dashboards-observability that referenced this pull request Nov 13, 2023
mengweieric added a commit to mengweieric/dashboards-observability that referenced this pull request Nov 13, 2023
@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-observability/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.x
# Create a new branch
git switch --create backport/backport-1137-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 71967041344cd3bad4edfb86a298b29ea75c9050
# Push it to GitHub
git push --set-upstream origin backport/backport-1137-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.x

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

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.

3 participants