[2.x] Fixed day of year defaulting for round up parser (#4627) #4678
Conversation
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## 2.x #4678 +/- ##
=========================================
Coverage 70.62% 70.63%
+ Complexity 57126 57114 -12
=========================================
Files 4585 4585
Lines 274526 274534 +8
Branches 40233 40234 +1
=========================================
+ Hits 193876 193908 +32
+ Misses 64403 64350 -53
- Partials 16247 16276 +29
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
tlfeng
changed the title
Signed-off-by: Vishal Sarda <vsarda@amazon.com>
| - [Bug]: Fixed invalid location of JDK dependency for arm64 architecture([#4613](https://github.com/opensearch-project/OpenSearch/pull/4613)) | ||
| - Updated jackson to 2.13.4 and snakeyml to 1.32 ([#4556](https://github.com/opensearch-project/OpenSearch/pull/4556)) | ||
| - Fixed day of year defaulting for round up parser ([#4627](https://github.com/opensearch-project/OpenSearch/pull/4627)) | ||
| - Fixed the SnapshotsInProgress error during index deletion ([#4570](https://github.com/opensearch-project/OpenSearch/pull/4570)) | ||
| - [Bug]: Fixed invalid location of JDK dependency for arm64 architecture([#4613](https://github.com/opensearch-project/OpenSearch/pull/4613)) |
There was a problem hiding this comment.
Thanks @Vishalks for this fix.
Why are we updating the unrelated changelog entries ?
There was a problem hiding this comment.
I believe that's a result of resolving the conflict between main and 2.x branches.
I don't think it's a big problem here, he only added one line to this part Updated jackson to 2.13.4 and snakeyml to 1.32, which existed in this location in main branch, but existed in a below line in this file of 2.x branch.
There was a problem hiding this comment.
Of course the changelog in 2.x branch is very confusing, anyway it will be refactored to be more clear soon.
There was a problem hiding this comment.
I need to change my way of resolving merge conflicts which is leading to changing the unrelated entries.
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: Vishal Sarda vsarda@amazon.com
(cherry picked from commit a17692d)
Description
This change fixes the conflict gets when trying to round up input date ranges, specifically for the format "yyyy-DDD'T'HH:mm:ss.SSS". For this input format, we default day of year to 1 else default month of year and day of month to 1
Issues Resolved
#4285
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.