Merge release v1.3.2 to master#9323
Merged
tiborvass merged 13 commits intomoby:masterfrom Nov 25, 2014
Merged
Conversation
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <[email protected]> (github: unclejack)
These settings need to be in the HostConfig so that they are not committed to an image and cannot introduce a security issue. We can safely move this field from the Config to the HostConfig without any regressions because these settings are consumed at container created and used to populate fields on the Container struct. Because of this, existing settings will be honored for containers already created on a daemon with custom security settings and prevent values being consumed via an Image. Signed-off-by: Michael Crosby <[email protected]> Conflicts: daemon/create.go changing config to hostConfig was required to fix the build
Signed-off-by: Michael Crosby <[email protected]>
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <[email protected]> (github: unclejack) Conflicts: builder/internals.go daemon/graphdriver/aufs/aufs.go daemon/volumes.go fixed conflicts in imports
Signed-off-by: Tibor Vass <[email protected]> Conflicts: graph/load.go fixed conflict in imports
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <[email protected]> (github: unclejack) Conflicts: daemon/graphdriver/aufs/aufs_test.go fixed conflict caused by imports
Signed-off-by: Tibor Vass <[email protected]> Conflicts: pkg/archive/archive.go fixed conflict which git couldn't fix with the added BreakoutError Conflicts: pkg/archive/archive_test.go fixed conflict in imports
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Tibor Vass <[email protected]>
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <[email protected]> (github: unclejack)
Signed-off-by: Tibor Vass <[email protected]>
unclejack
force-pushed
the
merge_release_v1.3.2
branch
from
6ca7756 to
6cba358
Compare
Contributor
|
@unclejack looks like there are a few compile errors integrating this. |
unclejack
force-pushed
the
merge_release_v1.3.2
branch
from
6cba358 to
58c665c
Compare
Signed-off-by: Cristian Staretu <[email protected]>
Signed-off-by: Tibor Vass <[email protected]> Signed-off-by: Cristian Staretu <[email protected]>
unclejack
force-pushed
the
merge_release_v1.3.2
branch
from
58c665c to
b21e1d4
Compare
Contributor
Author
|
@crosbymichael @tiborvass Sorry for the delay. PTAL |
Contributor
|
LGTM |
1 similar comment
Contributor
|
LGTM |
tiborvass
added a commit
that referenced
this pull request
Nov 25, 2014
Merge release v1.3.2 to master
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
No description provided.