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

Rebase #937 #1031

Merged
merged 1 commit into from
Feb 5, 2020
Merged

Rebase #937 #1031

merged 1 commit into from
Feb 5, 2020

Conversation

h-vetinari
Copy link
Contributor

@vbatts asked if I could rebase #937 by @Mashimiao, which I did here.

There were some trivial conflicts in config.md, config-linux.md & config-windows.md. The only question was whether to add asterisks around l3cacheSchema, compare the original here. I went and added them here as well, but those can easily be removed.

Signed-off-by: Ma Shimiao <[email protected]>
Signed-off-by: H. Vetinari <[email protected]>
@vbatts
Copy link
Member

vbatts commented Feb 5, 2020

LGTM

Approved with PullApprove

1 similar comment
@tianon
Copy link
Member

tianon commented Feb 5, 2020

LGTM

Approved with PullApprove

@tianon tianon merged commit 39c287c into opencontainers:master Feb 5, 2020
@h-vetinari h-vetinari deleted the rebase_937 branch February 6, 2020 07:53
@h-vetinari h-vetinari mentioned this pull request Mar 7, 2020
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.

3 participants