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.

Sign up for GitHub

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

Jump to bottom

Fix issue #1890: config.json with no linux config should not crash #1894

Merged
merged 1 commit into from Oct 8, 2018
Merged

Fix issue #1890: config.json with no linux config should not crash #1894

merged 1 commit into from Oct 8, 2018
+6 −6

Conversation

marler8997
Copy link
Contributor

@marler8997 marler8997 commented Sep 17, 2018 •
edited

Fix #1890

Just moved the check for spec.Linux.IntelRdt into the if spec.Linux != nil block.

@marler8997 marler8997 changed the title Move spec.Linux.IntelRdt check to spec.Linux != nil block Fix issues #1890: config.json with no linux config should not crash Sep 17, 2018
@marler8997 marler8997 changed the title Fix issues #1890: config.json with no linux config should not crash Fix issue #1890: config.json with no linux config should not crash Sep 17, 2018
mikebrow
mikebrow reviewed Oct 4, 2018
View reviewed changes
Copy link
Member

@mikebrow mikebrow left a comment •
edited

Choose a reason for hiding this comment

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

looks good to me, but you didn't sign your commit so it failed the DCO requirement.

@marler8997
Move spec.Linux.IntelRdt check to spec.Linux != nil block
1499c74 
Signed-off-by: Jonathan Marler <johnnymarler@gmail.com>
@crosbymichael
Copy link
Member

crosbymichael commented Oct 5, 2018 •
edited by caniszczyk

LGTM

Approved with PullApprove

@cyphar
Copy link
Member

cyphar commented Oct 8, 2018 •
edited by caniszczyk

LGTM.

Approved with PullApprove

@cyphar cyphar merged commit 1499c74 into opencontainers:master Oct 8, 2018
cyphar added a commit that referenced this pull request Oct 8, 2018
@cyphar
merge branch 'pr-1894'
e40d463 
  Move spec.Linux.IntelRdt check to spec.Linux != nil block

LGTMs: @crosbymichael @cyphar
Closes #1894
@xiaochenshen xiaochenshen mentioned this pull request Oct 16, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikebrow mikebrow mikebrow left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@marler8997 @crosbymichael @cyphar @mikebrow