Skip to content

Commit 31e3410

Browse files
Fix issue with updating core with a patch number other than 0 (#19377)
* Fix issue with updating core with a patch number other than 0 Signed-off-by: Craig Perkins <[email protected]> * Add to CHANGELOG Signed-off-by: Craig Perkins <[email protected]> --------- Signed-off-by: Craig Perkins <[email protected]> (cherry picked from commit 4094287) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent dad6b84 commit 31e3410

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
99
### Changed
1010

1111
### Fixed
12+
- Fix Allocation and Rebalance Constraints of WeightFunction are incorrectly reset ([#19012](https://github.com/opensearch-project/OpenSearch/pull/19012))
13+
- Fix flaky test FieldDataLoadingIT.testIndicesFieldDataCacheSizeSetting ([#19571](https://github.com/opensearch-project/OpenSearch/pull/19571))
14+
- Avoid primary shard failure caused by merged segment warmer exceptions ([#19436](https://github.com/opensearch-project/OpenSearch/pull/19436))
15+
- Fix pull-based ingestion out-of-bounds offset scenarios and remove persisted offsets ([#19607](https://github.com/opensearch-project/OpenSearch/pull/19607))
16+
- [Star Tree] Fix sub-aggregator casting for search with profile=true ([19652](https://github.com/opensearch-project/OpenSearch/pull/19652))
17+
- Fix issue with updating core with a patch number other than 0 ([#19377](https://github.com/opensearch-project/OpenSearch/pull/19377))
1218

1319
### Dependencies
1420

buildSrc/src/main/java/org/opensearch/gradle/info/GlobalBuildInfoPlugin.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,8 @@ private static BwcVersions resolveBwcVersions(File root) {
149149
// todo redesign this terrible unreliable hack; should NEVER rely on parsing a source file
150150
// for now, we hack the hack
151151
File versionsFile = new File(root, DEFAULT_VERSION_JAVA_FILE_PATH);
152-
File legacyVersionsFile = new File(root, DEFAULT_LEGACY_VERSION_JAVA_FILE_PATH);
153-
try (FileInputStream fis = new FileInputStream(versionsFile); FileInputStream fis2 = new FileInputStream(legacyVersionsFile)) {
152+
try (FileInputStream fis = new FileInputStream(versionsFile)) {
154153
List<String> versionLines = IOUtils.readLines(fis, "UTF-8");
155-
versionLines.addAll(IOUtils.readLines(fis2, "UTF-8"));
156154
return new BwcVersions(versionLines);
157155
} catch (IOException e) {
158156
throw new IllegalStateException("Unable to resolve bwc versions from versionsFile.", e);

0 commit comments

Comments
 (0)