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/0.4] Cherry pick fixes from main branch #318

Merged
merged 3 commits into from
May 21, 2024

Conversation

kiashok
Copy link

@kiashok kiashok commented May 21, 2024

Cherry picks 8f0d50b , 008bc6e

@kiashok kiashok requested a review from a team as a code owner May 21, 2024 18:32
@kiashok kiashok marked this pull request as draft May 21, 2024 18:33
katiewasnothere and others added 2 commits May 21, 2024 11:34
…fo commits "

(cherry picked from commit 8f0d50b)
Signed-off-by: Kirtana Ashok <[email protected]>
* fileinfo: internally fix FileBasicInfo memory alignment

Signed-off-by: Davis Goodin <[email protected]>

* Update test with review feedback

Remove unused winName.

Extract more into Windows alignment consts to repeat less.

Document reason for having multiple alignment consts for the same value.

Signed-off-by: Davis Goodin <[email protected]>

---------

Signed-off-by: Davis Goodin <[email protected]>
(cherry picked from commit 008bc6e)
Signed-off-by: Kirtana Ashok <[email protected]>
@kiashok kiashok force-pushed the cherry-pick-fix branch from f3b0cdd to ca56161 Compare May 21, 2024 18:34
Signed-off-by: Kirtana Ashok <[email protected]>
@kiashok kiashok marked this pull request as ready for review May 21, 2024 19:28
@kiashok
Copy link
Author

kiashok commented May 21, 2024

@helsaawy could you take a look? Cherry-picking a few changes primarily that were needed to bring #312 into containerd/1.6 via new tag for hcsshim/release/0.9

@kiashok kiashok merged commit bea17c3 into microsoft:release/0.4 May 21, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants