[Manual Backport 1.x] [CVE-2020-36632] Bump flat from 4.1.1 to 5.0.2#3539
Merged
joshuarrrr merged 4 commits intoopensearch-project:1.xfrom Mar 8, 2023
Merged
[Manual Backport 1.x] [CVE-2020-36632] Bump flat from 4.1.1 to 5.0.2#3539joshuarrrr merged 4 commits intoopensearch-project:1.xfrom
joshuarrrr merged 4 commits intoopensearch-project:1.xfrom
Conversation
Signed-off-by: Josh Romero <rmerqg@amazon.com>
Signed-off-by: Josh Romero <rmerqg@amazon.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## 1.x #3539 +/- ##
==========================================
+ Coverage 67.45% 67.49% +0.04%
==========================================
Files 3044 3044
Lines 58696 58696
Branches 8902 8902
==========================================
+ Hits 39591 39615 +24
+ Misses 16952 16932 -20
+ Partials 2153 2149 -4
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Collaborator
|
@joshuarrrr seems like there is a conflict |
ananzh
approved these changes
Mar 7, 2023
kavilla
approved these changes
Mar 7, 2023
Member
Author
|
ignoring whitesource failure |
Contributor
|
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-1.3 1.3
# Navigate to the new working tree
pushd ../.worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-3539-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3a51afda8e8d8c82cf30cea7344b1e8c278f1977
# Push it to GitHub
git push --set-upstream origin backport/backport-3539-to-1.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.3Then, create a pull request where the |
Member
Author
|
this doesn't need backporting, of course - already in #3520 |
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
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
manual backport of #3520
Issues Resolved
Resolves #3167
Check List
yarn test:jestyarn test:jest_integrationyarn test:ftr