Skip to content
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

[release-15.0] Bump github.com/cyphar/filepath-securejoin from 0.2.3 to 0.2.4 (#14239) #14250

Merged
merged 1 commit into from
Oct 11, 2023

Conversation

vitess-bot[bot]
Copy link
Contributor

@vitess-bot vitess-bot bot commented Oct 11, 2023

Description

This is a backport of #14239

@vitess-bot vitess-bot bot added Backport This is a backport Component: General Changes throughout the code base dependencies Pull requests that update a dependency file go Merge Conflict Skip CI Skip CI actions from running Type: Dependencies Dependency updates labels Oct 11, 2023
@vitess-bot
Copy link
Contributor Author

vitess-bot bot commented Oct 11, 2023

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

  • Ensure that the Pull Request has a descriptive title.
  • Ensure there is a link to an issue (except for internal cleanup and flaky test fixes), new features should have an RFC that documents use cases and test cases.

Tests

  • Bug fixes should have at least one unit or end-to-end test, enhancement and new features should have a sufficient number of tests.

Documentation

  • Apply the release notes (needs details) label if users need to know about this change.
  • New features should be documented.
  • There should be some code comments as to why things are implemented the way they are.
  • There should be a comment at the top of each new or modified test to explain what the test does.

New flags

  • Is this flag really necessary?
  • Flag names must be clear and intuitive, use dashes (-), and have a clear help text.

If a workflow is added or modified:

  • Each item in Jobs should be named in order to mark it as required.
  • If the workflow needs to be marked as required, the maintainer team must be notified.

Backward compatibility

  • Protobuf changes should be wire-compatible.
  • Changes to _vt tables and RPCs need to be backward compatible.
  • RPC changes should be compatible with vitess-operator
  • If a flag is removed, then it should also be removed from vitess-operator and arewefastyet, if used there.
  • vtctl command output order should be stable and awk-able.

@vitess-bot
Copy link
Contributor Author

vitess-bot bot commented Oct 11, 2023

Hello @dependabot[bot], there are conflicts in this backport.

Please address them in order to merge this Pull Request. You can execute the snippet below to reset your branch and resolve the conflict manually.

Make sure you replace origin by the name of the vitessio/vitess remote

git fetch --all
gh pr checkout 14250 -R vitessio/vitess
git reset --hard origin/release-15.0
git cherry-pick -m 1 bc3bd0bfb0bed80685690cb1210444ebfbbb25e4

@github-actions github-actions bot added this to the v15.0.6 milestone Oct 11, 2023
@frouioui frouioui force-pushed the backport-14239-to-release-15.0 branch from 478ff41 to 3ec213c Compare October 11, 2023 15:44
@frouioui frouioui removed the Skip CI Skip CI actions from running label Oct 11, 2023
@frouioui frouioui marked this pull request as ready for review October 11, 2023 15:45
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Florent Poinsard <[email protected]>
@frouioui frouioui force-pushed the backport-14239-to-release-15.0 branch from 3ec213c to 5fe6bd6 Compare October 11, 2023 15:46
@deepthi deepthi merged commit f328b85 into release-15.0 Oct 11, 2023
228 checks passed
@deepthi deepthi deleted the backport-14239-to-release-15.0 branch October 11, 2023 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport This is a backport Component: General Changes throughout the code base dependencies Pull requests that update a dependency file go Type: Dependencies Dependency updates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants