Bump hcsshim to v0.8.5 #4
Merged
Conversation
This file contains 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
Some error messages changed with the bump to hcsshim v0.8.5 Signed-off-by: Yechiel Kalmenson <ykalmenson@pivotal.io>
Uses greenhouse-org/hcsshim, branch upstream-v0.8.5-mod. This contains all commits from Microsoft/hcsshim v.0.8.5 + commits made by our team to the fork. Many transitive dependencies have been updated. This update includes our PR (microsoft/hcsshim#431) to the syscall watcher All the tests pass with no major API changes Signed-off-by: Arjun Sreedharan <asreedharan@pivotal.io>
|
We have created an issue in Pivotal Tracker to manage this: https://www.pivotaltracker.com/story/show/163575800 The labels on this github issue will be updated when the story is started. |
|
✅ Hey arjun024! The commit authors and yourself have already signed the CLA. |
|
@sesmith177 @natalieparellano -- Thought we'll run it by you and see if you have any comments before merging. |
|
I have two small concerns here:
|
|
|
On the fork, we have made one commit that takes all the changes in "our" previous commits and pushed it on top of v0.8.5. Now the git history is clean -- our changes are on top of the Microsoft changes. See greenhouse-org/hcsshim@d3cfe7c |
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.
Update vendored hcsshim to greenhouse-org/hcsshim, branch: upstream-v0.8.5-mod
(https://github.com/greenhouse-org/hcsshim/tree/upstream-v0.8.5-mod).
This branch of the hcsshim fork contains all commits from Microsoft/hcsshim v.0.8.5 rebased
on top of all commits previously made by the garden windows team to add extra endpoint info (see microsoft/hcsshim@master...greenhouse-org:extra-endpoint-info).
The fork-branch also includes the fix to the race condition in syscallWatcher (See PR Fix race in syscallWatcher microsoft/hcsshim#431).
Tested on: Windows 1803.2, Windows 1709.17
Tracker-story: https://www.pivotaltracker.com/story/show/162997839
cc: @achasveachas