Merge branch 'main' to feature/ip2geo#361
Merged
heemin32 merged 11 commits intoopensearch-project:feature/ip2geofrom Jul 21, 2023
Merged
Merge branch 'main' to feature/ip2geo#361heemin32 merged 11 commits intoopensearch-project:feature/ip2geofrom
heemin32 merged 11 commits intoopensearch-project:feature/ip2geofrom
Conversation
Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com>
…-project#268) Signed-off-by: Heemin Kim <heemin@amazon.com>
…t#267) Signed-off-by: Heemin Kim <heemin@amazon.com>
Co-authored-by: mend-for-gitlite.zycloud.tk[bot] <50673670+mend-for-gitlite.zycloud.tk[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>
…project#353) Signed-off-by: Heemin Kim <heemin@amazon.com>
Signed-off-by: Heemin Kim <heemin@amazon.com>
heemin32
requested review from
VijayanB,
jmazanec15,
junqiu-lei,
martin-gaievski,
naveentatikonda,
navneet1v and
vamshin
as code owners
Codecov Report
@@ 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 |
martin-gaievski
approved these changes
Jul 21, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
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.