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

Refactoring changes in main #328

Merged
merged 11 commits into from
Aug 29, 2023
Merged

Conversation

bharath-techie
Copy link
Collaborator

@bharath-techie bharath-techie commented Aug 28, 2023

Description

Addressing Refactoring core changes in opensearch

Issues Resolved

#322

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Bharathwaj G <[email protected]>
Signed-off-by: Bharathwaj G <[email protected]>
@codecov
Copy link

codecov bot commented Aug 28, 2023

Codecov Report

❗ No coverage uploaded for pull request base (main@9942734). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head 4294ba4 differs from pull request most recent head f7a507c. Consider uploading reports for the commit f7a507c to get more accurate results

@@           Coverage Diff           @@
##             main     #328   +/-   ##
=======================================
  Coverage        ?   83.82%           
  Complexity      ?      554           
=======================================
  Files           ?       61           
  Lines           ?     2046           
  Branches        ?      146           
=======================================
  Hits            ?     1715           
  Misses          ?      234           
  Partials        ?       97           

Signed-off-by: Bharathwaj G <[email protected]>
@bharath-techie bharath-techie changed the title Reafactoring changes in main Refactoring changes in main Aug 28, 2023
Signed-off-by: Bharathwaj G <[email protected]>
Signed-off-by: Bharathwaj G <[email protected]>
@dhruv16dhr dhruv16dhr merged commit 305433c into opensearch-project:main Aug 29, 2023
@bharath-techie bharath-techie added the backport 2.x backport to 2.x label Aug 31, 2023
@opensearch-trigger-bot
Copy link

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

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

1 similar comment
@opensearch-trigger-bot
Copy link

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport to 2.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants