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

Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9. #21541

Merged
merged 1 commit into from Mar 29, 2016

Conversation

yongtang
Copy link
Member

This PR updates vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9 in order to support SecurityOptions in Info.

See #20909, #21172 for details related to SecurityOptions.

SecurityOptions was added in Info through pull request docker/engine-api#157 in engine-api.

Signed-off-by: Yong Tang yong.tang.github@outlook.com

@yongtang yongtang changed the title Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9 for SecurityOptions support. Update vendored engine-api for SecurityOptions support. Mar 26, 2016
@yongtang yongtang force-pushed the 20909-engine-api branch 2 times, most recently from 37b9e85 to 380689c Compare March 26, 2016 16:06
@yongtang yongtang changed the title Update vendored engine-api for SecurityOptions support. Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9. Mar 26, 2016
@yongtang yongtang force-pushed the 20909-engine-api branch 3 times, most recently from a3a91e7 to 62af53b Compare March 27, 2016 16:06
This PR updates vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9
in order to support `SecurityOptions` in `Info`.

See moby#20909, moby#21172 for details related to `SecurityOptions`.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
@calavera
Copy link
Contributor

LGTM

@yongtang
Copy link
Member Author

cc @thaJeztah @justincormack as this PR of updating vendor/engine-api is the prerequisite to fix #20909 Show "seccomp" in docker info.

@thaJeztah
Copy link
Member

LGTM, but do we know which PR these changes relate to? https://github.com/docker/docker/pull/21541/files#diff-1089f5ff51f8af5380780b7a12ee52f4R242, wondering if that should be documented

@yongtang
Copy link
Member Author

Hi @thaJeztah SecurityOptions was added in Info through pull request docker/engine-api#157 in engine-api. I updated the comment of this pull request to take note. Let me know if there are other issues.

@thaJeztah
Copy link
Member

Oh, sorry, I meant the MaximumIOps options, but let me merge this one, then we can look for the PR that uses those changes 😄

@thaJeztah thaJeztah merged commit eeaf143 into moby:master Mar 29, 2016
@yongtang yongtang deleted the 20909-engine-api branch March 29, 2016 02:14
@darstahl
Copy link
Contributor

The PR that uses the IOps changes is #21384

@thaJeztah
Copy link
Member

Oh, thanks @darrenstahlmsft !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants