Merge release v1.3.1#8870
Merged
Merged
Conversation
Member
There was a problem hiding this comment.
Typo s/envrionment/environment
88f65e8 to
ebfc9a2
Compare
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <[email protected]> (github: unclejack) Conflicts: daemon/config.go daemon/daemon.go graph/pull.go graph/push.go graph/tags.go registry/registry.go registry/service.go
Fix issue with restoring the tag store and setting static configuration from the daemon. i.e. the field on the TagStore struct must be made internal or the json.Unmarshal in restore will overwrite the insecure registries to be an empty struct. Signed-off-by: Michael Crosby <[email protected]> Conflicts: graph/pull.go graph/push.go graph/tags.go
Signed-off-by: Michael Crosby <[email protected]>
Signed-off-by: Michael Crosby <[email protected]> Conflicts: registry/service.go
…registry Signed-off-by: Tibor Vass <[email protected]> Conflicts: registry/registry.go registry/registry_test.go registry/service.go registry/session.go Conflicts: registry/endpoint.go registry/registry.go
Signed-off-by: Tibor Vass <[email protected]> Conflicts: docs/sources/index.md Conflicts: docs/sources/index.md
Signed-off-by: Tibor Vass <[email protected]>
Signed-off-by: Tibor Vass <[email protected]> Conflicts: VERSION
Signed-off-by: Tibor Vass <[email protected]>
ebfc9a2 to
b9fcdb8
Compare
Contributor
|
LGTM |
Contributor
Author
Contributor
|
The tests are passing and the commits look good to me. |
Contributor
|
LGTM |
Contributor
|
LGTM |
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
6 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.
Ping @ewindisch @unclejack @crosbymichael @jfrazelle @LK4D4 @vieux
Please make sure all 1.3.1 commits from the release branch are here, or on master.