-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Manually backport #11060 (Simple regex normalization refactor) #11147
Manually backport #11060 (Simple regex normalization refactor) #11147
Conversation
Signed-off-by: Stephen Crawford <[email protected]>
@reta can you mark this 2.11 backport please? |
Gradle Check (Jenkins) Run Completed with:
|
Compatibility status:Checks if related components are compatible with change e0f6b38 Incompatible componentsIncompatible components: [https://github.com/opensearch-project/performance-analyzer.git] Skipped componentsCompatible componentsCompatible components: [https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/alerting.git] |
Signed-off-by: Stephen Crawford <[email protected]>
Gradle Check (Jenkins) Run Completed with:
|
I am good with backporting this fix to 2.11 branch and release in 2.11.1 patch version. |
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## 2.x #11147 +/- ##
============================================
+ Coverage 70.98% 71.03% +0.05%
- Complexity 58895 58994 +99
============================================
Files 4851 4862 +11
Lines 278023 278385 +362
Branches 40765 40805 +40
============================================
+ Hits 197358 197758 +400
+ Misses 63872 63808 -64
- Partials 16793 16819 +26
|
The backport to
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.11 2.11
# Navigate to the new working tree
pushd ../.worktrees/backport-2.11
# Create a new branch
git switch --create backport/backport-11147-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 725d505f49c7d319aa52e550febcaad07eb4e0bf
# Push it to GitHub
git push --set-upstream origin backport/backport-11147-to-2.11
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.11 Then, create a pull request where the |
@scrawfor99 |
…n refactor) (opensearch-project#11147) * Manually backport 11060 Signed-off-by: Stephen Crawford <[email protected]> * spotless Signed-off-by: Stephen Crawford <[email protected]> --------- Signed-off-by: Stephen Crawford <[email protected]> (cherry picked from commit 725d505)
… (#11185) * Manually backport 11060 Signed-off-by: Stephen Crawford <[email protected]> * spotless Signed-off-by: Stephen Crawford <[email protected]> --------- Signed-off-by: Stephen Crawford <[email protected]> (cherry picked from commit 725d505) Co-authored-by: Stephen Crawford <[email protected]>
Description
[Describe what this change achieves]
Related Issues
Resolves #[Issue number to be closed when this PR is merged]
Check List
New functionality has been documented.New functionality has javadoc addedFailing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)Public documentation issue/PR createdBy 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.