Skip to content

Backport of NET-4240 - Snapshots are failing on Windows into release/1.15.x#18355

Merged
asheshvidyut merged 4 commits intorelease/1.15.xfrom
backport/NET-4240/easily-deep-bluejay
Aug 2, 2023
Merged

Backport of NET-4240 - Snapshots are failing on Windows into release/1.15.x#18355
asheshvidyut merged 4 commits intorelease/1.15.xfrom
backport/NET-4240/easily-deep-bluejay

Conversation

@hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #18302 to be assessed for backporting due to the inclusion of the label backport/1.15.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@absolutelightning
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "7d54aee30a8ea22b2b8b17b23ebe3a71ca439d1a", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


Description

Updates version of rboyer/safeio#3 to github.com/rboyer/safeio v0.2.3. To fix snapshot save in windows. More description here - rboyer/safeio#3

Testing & Reproduction steps

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-4240/easily-deep-bluejay branch 2 times, most recently from 21bb924 to 96084f7 Compare August 2, 2023 02:45
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-4240/easily-deep-bluejay branch from 1ff1f43 to b02469a Compare August 2, 2023 02:45
@github-actions github-actions bot added the pr/dependencies PR specifically updates dependencies of project label Aug 2, 2023
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging August 2, 2023 02:48 Inactive
@vercel vercel bot temporarily deployed to Preview – consul August 2, 2023 02:50 Inactive
@asheshvidyut asheshvidyut marked this pull request as ready for review August 2, 2023 07:22
@asheshvidyut asheshvidyut merged commit 1f07e1b into release/1.15.x Aug 2, 2023
@asheshvidyut asheshvidyut deleted the backport/NET-4240/easily-deep-bluejay branch August 2, 2023 08:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/dependencies PR specifically updates dependencies of project

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants