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

Merge branch 'main' to feature/ip2geo #361

Merged
merged 11 commits into from
Jul 21, 2023

Conversation

heemin32
Copy link
Collaborator

@heemin32 heemin32 commented Jul 21, 2023

Description

Merge branch 'main' to feature/ip2geo

Commit conflict happened during merging feature/ip2geo to branch 'main' so resolve it here as it is not allowed to resolve the conflict in official repo directly.

Issues Resolved

N/A

Check List

  • Commits are signed per the DCO using --signoff

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.

VijayanB and others added 11 commits April 25, 2023 18:18
Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com>
Signed-off-by: Naveen Tatikonda <navtat@amazon.com>
Signed-off-by: Heemin Kim <heemin@amazon.com>
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
Signed-off-by: Junqiu Lei <junqiu@amazon.com>
Signed-off-by: Heemin Kim <heemin@amazon.com>
@codecov
Copy link

codecov bot commented Jul 21, 2023

Codecov Report

Merging #361 (427ebe5) into feature/ip2geo (2e4fdf2) will not change coverage.
The diff coverage is n/a.

@@                Coverage Diff                @@
##             feature/ip2geo     #361   +/-   ##
=================================================
  Coverage             88.46%   88.46%           
  Complexity              747      747           
=================================================
  Files                    91       91           
  Lines                  2697     2697           
  Branches                215      215           
=================================================
  Hits                   2386     2386           
  Misses                  232      232           
  Partials                 79       79           

Copy link
Member

@vamshin vamshin left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks

@heemin32 heemin32 merged commit 6b137fd into opensearch-project:feature/ip2geo Jul 21, 2023
23 checks passed
@heemin32 heemin32 deleted the feature/ip2geo branch July 21, 2023 19:59
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.

6 participants